Author: mdounin
Date: 2012-06-04 12:00:38 +0000 (Mon, 04 Jun 2012)
New Revision: 4670
URL: http://trac.nginx.org/nginx/changeset/4670/nginx

Log:
Merge of r4630: fixed c->sent with unbuffered ssl.

Update c->sent in ngx_ssl_send_chain() even if SSL buffer is not used.


Modified:
branches/stable-1.2/
branches/stable-1.2/src/event/ngx_event_openssl.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-06-04 11:58:12 UTC (rev 4669)
+++ branches/stable-1.2 2012-06-04 12:00:38 UTC (rev 4670)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4629,4631,4641
+/trunk:4611-4631,4641
\ No newline at end of property
Modified: branches/stable-1.2/src/event/ngx_event_openssl.c
===================================================================
--- branches/stable-1.2/src/event/ngx_event_openssl.c 2012-06-04 11:58:12 UTC (rev 4669)
+++ branches/stable-1.2/src/event/ngx_event_openssl.c 2012-06-04 12:00:38 UTC (rev 4670)
@@ -995,6 +995,7 @@
}

in->buf->pos += n;
+ c->sent += n;

if (in->buf->pos == in->buf->last) {
in = in->next;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel