commit 4b2f12a60485661039bad8e334716eba7fbc7b24
author Maxim Dounin <mdounin@mdounin.ru> Mon Jul 28 18:30:14 2014 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Mon Jul 28 18:30:14 2014 +0400
tree 25e285186d4d764a7fa9dbf97d3303b058812f69
parent 7b24c53efee348e919d03cba5c74445095402593

Upstream: SSL handshake timeouts.

Timeout may not be set on an upstream connection when we call
ngx_ssl_handshake() in ngx_http_upstream_ssl_init_connection(),
so make sure to arm it if it's not set.

Based on a patch by Yichun Zhang.

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 58edc62..18b04f7 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1393,6 +1393,11 @@
     rc = ngx_ssl_handshake(c);
 
     if (rc == NGX_AGAIN) {
+
+        if (!c->write->timer_set) {
+            ngx_add_timer(c->write, u->conf->connect_timeout);
+        }
+
         c->ssl->handler = ngx_http_upstream_ssl_handshake;
         return;
     }