[nginx] Stream: delete proxy connection timer after SSL handshake.

Roman Arutyunyan arut at nginx.com
Tue Oct 6 05:59:37 UTC 2015


details:   http://hg.nginx.org/nginx/rev/4b4aee40c508
branches:  
changeset: 6258:4b4aee40c508
user:      Ruslan Ermilov <ru at nginx.com>
date:      Tue Oct 06 08:57:09 2015 +0300
description:
Stream: delete proxy connection timer after SSL handshake.

The timer remained active and could drop active SSL connection.

diffstat:

 src/stream/ngx_stream_proxy_module.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r 5eb4d7541107 -r 4b4aee40c508 src/stream/ngx_stream_proxy_module.c
--- a/src/stream/ngx_stream_proxy_module.c	Sun Jul 12 08:31:38 2015 -0700
+++ b/src/stream/ngx_stream_proxy_module.c	Tue Oct 06 08:57:09 2015 +0300
@@ -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;



More information about the nginx-devel mailing list