From: Ruslan Ermilov <ru@nginx.com>
Date: Tue, 6 Oct 2015 05:57:09 +0000 (+0300)
Subject: Stream: delete proxy connection timer after SSL handshake.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=0079f29326ceed9b3868e4afcebf19de168702f2;p=nginx.git

Stream: delete proxy connection timer after SSL handshake.

The timer remained active and could drop active SSL connection.
---

diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index ea142e722..6800500cc 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -759,6 +759,10 @@ ngx_stream_proxy_ssl_handshake(ngx_connection_t *pc)
             u->peer.save_session(&u->peer, u->peer.data);
         }
 
+        if (pc->write->timer_set) {
+            ngx_del_timer(pc->write);
+        }
+
         ngx_stream_proxy_init_upstream(s);
 
         return;