commit 067c1d2a4f48cbbaace59733c98007b793719f94
author Maxim Dounin <mdounin@mdounin.ru> Fri Nov 29 17:16:06 2013 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Fri Nov 29 17:16:06 2013 +0400
tree de7d396aa8de91c7cd9e025ca75f4e27105fb453
parent 6b7e88f36b2564b91fe68b1a5628d52a24384343

SSL: fixed c->read->ready handling in ngx_ssl_recv().

If c->read->ready was reset, but later some data were read from a socket
buffer due to a call to ngx_ssl_recv(), the c->read->ready flag should
be restored if not all data were read from OpenSSL buffers (as kernel
won't notify us about the data anymore).

More details are available here:
http://mailman.nginx.org/pipermail/nginx/2013-November/041178.html

src/event/ngx_event_openssl.c

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index e4bc1a2..ee66713 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1025,6 +1025,7 @@
             size -= n;
 
             if (size == 0) {
+                c->read->ready = 1;
                 return bytes;
             }
 
@@ -1034,6 +1035,10 @@
         }
 
         if (bytes) {
+            if (c->ssl->last != NGX_AGAIN) {
+                c->read->ready = 1;
+            }
+
             return bytes;
         }