]> git.kaiwu.me - nginx.git/commitdiff
Merged with the default branch.
authorSergey Kandaurov <pluknet@nginx.com>
Tue, 26 May 2020 17:26:44 +0000 (20:26 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Tue, 26 May 2020 17:26:44 +0000 (20:26 +0300)
1  2 
src/event/ngx_event_openssl.c
src/event/ngx_event_openssl.h
src/http/modules/ngx_http_ssl_module.c
src/http/ngx_http_request.c

index 2fd25444685e4ea1b1d8006152d9cba12b26fb0a,264d4e7a4cfabf89b6d29c8c8a4c242ef19f10f8..1777a5cfc3395345799ac5dbdfc8e02544ab110d
@@@ -2735,11 -2774,8 +2774,13 @@@ ngx_ssl_shutdown(ngx_connection_t *c
      int        n, sslerr, mode;
      ngx_err_t  err;
  
 +    if (c->qs) {
 +        /* QUIC streams inherit SSL object */
 +        return NGX_OK;
 +    }
 +
+     ngx_ssl_ocsp_cleanup(c);
      if (SSL_in_init(c->ssl->connection)) {
          /*
           * OpenSSL 1.0.2f complains if SSL_shutdown() is called during
Simple merge
Simple merge