commit 00325d87f9d4617390a9f87fc56412ca37647fcf
author Sergey Kandaurov <pluknet@nginx.com> Thu Feb 27 19:03:21 2020 +0300
committer Sergey Kandaurov <pluknet@nginx.com> Thu Feb 27 19:03:21 2020 +0300
tree 24979d3b8ee60821314fffbe632cc58c259e79cc
parent 7d8acd24dc3202185aa9c0fedfa33fae69efb55c

Disabled connection reuse while in SSL handshake.

During SSL handshake, the connection could be reused in the OCSP stapling
callback, if configured, which subsequently leads to a segmentation fault.

src/http/ngx_http_request.c

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 99fa696..bb69e71 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -748,6 +748,8 @@
                 return;
             }
 
+            ngx_reusable_connection(c, 0);
+
             rc = ngx_ssl_handshake(c);
 
             if (rc == NGX_AGAIN) {
@@ -756,8 +758,6 @@
                     ngx_add_timer(rev, c->listening->post_accept_timeout);
                 }
 
-                ngx_reusable_connection(c, 0);
-
                 c->ssl->handler = ngx_http_ssl_handshake_handler;
                 return;
             }