From: Roman Arutyunyan <arut@nginx.com>
Date: Tue, 18 Aug 2020 13:22:00 +0000 (+0300)
Subject: Merged with the default branch.
X-Git-Tag: release-1.25.0~4^2~599
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=fd6df645ebf2de0ba7bcd8df2dfd7337f5ab516f;p=nginx.git

Merged with the default branch.
---

fd6df645ebf2de0ba7bcd8df2dfd7337f5ab516f
diff --cc src/event/ngx_event_openssl.c
index dc0861ce9,f387c720d..8077f40a9
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@@ -2774,16 -2774,10 +2774,17 @@@ ngx_ssl_free_buffer(ngx_connection_t *c
  ngx_int_t
  ngx_ssl_shutdown(ngx_connection_t *c)
  {
-     int        n, sslerr, mode;
-     ngx_err_t  err;
+     int         n, sslerr, mode;
+     ngx_err_t   err;
+     ngx_uint_t  tries;
  
 +#if (NGX_QUIC)
 +    if (c->qs) {
 +        /* QUIC streams inherit SSL object */
 +        return NGX_OK;
 +    }
 +#endif
 +
      ngx_ssl_ocsp_cleanup(c);
  
      if (SSL_in_init(c->ssl->connection)) {
diff --cc src/http/ngx_http_request_body.c
index 568f11f02,71d7e9ab8..204253ca2
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@@ -958,17 -1016,10 +1025,16 @@@ ngx_http_request_body_chunked_filter(ng
              return NGX_HTTP_INTERNAL_SERVER_ERROR;
          }
  
+         cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+ 
          r->headers_in.content_length_n = 0;
+         rb->rest = cscf->large_client_header_buffers.size;
 +
 +#if (NGX_HTTP_V3)
 +        if (r->http_version == NGX_HTTP_VERSION_30) {
 +            rb->rest = 1;
- 
-         } else
- #endif
-         {
-             rb->rest = 3;
 +        }
++#endif
      }
  
      out = NULL;