# HG changeset patch # User Ruslan Ermilov # Date 1444111029 -10800 # Node ID 4b4aee40c508e79a536d85e74ae1ccfa19a3e5c2 # Parent 5eb4d7541107b9c259cda8c71c0d242d83836407 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 --- 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;