]> git.kaiwu.me - nginx.git/commitdiff
Stream: delete proxy connection timer after SSL handshake.
authorRuslan Ermilov <ru@nginx.com>
Tue, 6 Oct 2015 05:57:09 +0000 (08:57 +0300)
committerRuslan Ermilov <ru@nginx.com>
Tue, 6 Oct 2015 05:57:09 +0000 (08:57 +0300)
The timer remained active and could drop active SSL connection.

src/stream/ngx_stream_proxy_module.c

index ea142e7224a34ef2d5a8baac0c574e54ffe89ecb..6800500cc0fb7100e3bc0a8329b0ad89e9135702 100644 (file)
@@ -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;