Mercurial > hg > nginx

changeset 5340:13a5f4765887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: posted requests handling after ssl handshake errors. Missing call to ngx_http_run_posted_request() resulted in a main request hang if subrequest's ssl handshake with an upstream server failed for some reason. Reported by Aviram Cohen.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 23 Aug 2013 22:18:46 +0400
parents ee2a4c68fb35
children 654c1631dc86
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1338,13 +1338,19 @@ ngx_http_upstream_ssl_handshake(ngx_conn
         c->write->handler = ngx_http_upstream_handler;
         c->read->handler = ngx_http_upstream_handler;
 
+        c = r->connection;
+
         ngx_http_upstream_send_request(r, u);
 
+        ngx_http_run_posted_requests(c);
         return;
     }
 
+    c = r->connection;
+
     ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
 
+    ngx_http_run_posted_requests(c);
 }
 
 #endif