[nginx] svn commit: r4721 - in branches/stable-1.2: . src/event

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 15:51:02 +0000 (Mon, 02 Jul 2012)
New Revision: 4721
URL: http://trac.nginx.org/nginx/changeset/4721/nginx

Log:
Merge of r4652: ssl without buffer should not set c->buffered.

Removed mistaken setting of NGX_SSL_BUFFERED flag in ngx_ssl_send_chain()
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-07-02 15:43:50 UTC (rev 4720)
+++ branches/stable-1.2	2012-07-02 15:51:02 UTC (rev 4721)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4651,4674-4676
+/trunk:4611-4632,4636-4652,4674-4676
\ 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-07-02 15:43:50 UTC (rev 4720)
+++ branches/stable-1.2/src/event/ngx_event_openssl.c	2012-07-02 15:51:02 UTC (rev 4721)
@@ -990,7 +990,6 @@
             }
 
             if (n == NGX_AGAIN) {
-                c->buffered |= NGX_SSL_BUFFERED;
                 return in;
             }