Mercurial > hg > nginx

diff src/stream/ngx_stream_proxy_module.c @ 6258:4b4aee40c508

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stream: delete proxy connection timer after SSL handshake. The timer remained active and could drop active SSL connection.
author Ruslan Ermilov <ru@nginx.com>
date Tue, 06 Oct 2015 08:57:09 +0300
parents 2a621245f4cf
children 4eb1b5c6d9c6
line wrap: on
line diff
--- 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_conne
             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;