commit 210047e24d08e90e4a4df924f788e78c72216f34
author Maxim Dounin <mdounin@mdounin.ru> Mon Nov 14 17:21:06 2016 +0300
committer Maxim Dounin <mdounin@mdounin.ru> Mon Nov 14 17:21:06 2016 +0300
tree 49a573519b393c77edb58b05f474067ed411d879
parent 36f36f3e6389623d0620cb690a27d4148319699b

Upstream: handling of upstream SSL handshake timeouts.

Previously SSL handshake timeouts were not properly logged, and resulted
in 502 errors instead of 504 (ticket #1126).

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a6dd55e..ed25f43 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1666,6 +1666,13 @@
         return;
     }
 
+    if (c->write->timedout) {
+        c = r->connection;
+        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT);
+        ngx_http_run_posted_requests(c);
+        return;
+    }
+
 failed:
 
     c = r->connection;