From: Sergey Kandaurov <pluknet@nginx.com>
Date: Tue, 26 May 2020 17:26:44 +0000 (+0300)
Subject: Merged with the default branch.
X-Git-Tag: release-1.25.0~4^2~698
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=38091071a8ebef605433aef4b8c0a5b55845b43f;p=nginx.git

Merged with the default branch.
---

38091071a8ebef605433aef4b8c0a5b55845b43f
diff --cc src/event/ngx_event_openssl.c
index 2fd254446,264d4e7a4..1777a5cfc
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@@ -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