diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-10-06 08:57:09 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-10-06 08:57:09 +0300 |
| commit | 0079f29326ceed9b3868e4afcebf19de168702f2 (patch) | |
| tree | 3d8f9d0f1f1012a797ba4115fda4e908f4685509 /src/stream/ngx_stream_proxy_module.c | |
| parent | 470d0386712ade298b815979cda4d75f358f554d (diff) | |
| download | nginx-0079f29326ceed9b3868e4afcebf19de168702f2.tar.gz nginx-0079f29326ceed9b3868e4afcebf19de168702f2.zip | |
Stream: delete proxy connection timer after SSL handshake.
The timer remained active and could drop active SSL connection.
Diffstat (limited to 'src/stream/ngx_stream_proxy_module.c')
| -rw-r--r-- | src/stream/ngx_stream_proxy_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |