Mercurial > hg > nginx

changeset 6799:d8d037f20484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 14 Nov 2016 17:21:06 +0300
parents 2decd6b34306
children 49d7dbd25a27
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1666,6 +1666,13 @@ ngx_http_upstream_ssl_handshake(ngx_conn
         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;