From: Sergey Kandaurov <pluknet@nginx.com>
Date: Thu, 15 Jul 2021 13:28:21 +0000 (+0300)
Subject: Merged with the default branch.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=161759443ccf0e800327af130a3c431789259fa4;p=nginx.git

Merged with the default branch.
---

161759443ccf0e800327af130a3c431789259fa4
diff --cc src/event/ngx_event_openssl.c
index 50a9d8ad1,396cc22b3..e982c187d
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@@ -2899,13 -2900,8 +2900,15 @@@ ngx_ssl_shutdown(ngx_connection_t *c
      ngx_err_t   err;
      ngx_uint_t  tries;
  
 +#if (NGX_QUIC)
 +    if (c->quic) {
 +        /* QUIC streams inherit SSL object */
 +        return NGX_OK;
 +    }
 +#endif
 +
+     rc = NGX_OK;
+ 
      ngx_ssl_ocsp_cleanup(c);
  
      if (SSL_in_init(c->ssl->connection)) {
diff --cc src/http/ngx_http_request.h
index 60ef4fec1,63576274e..cd6bd6618
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@@ -24,24 -24,24 +24,25 @@@
  #define NGX_HTTP_VERSION_10                1000
  #define NGX_HTTP_VERSION_11                1001
  #define NGX_HTTP_VERSION_20                2000
 +#define NGX_HTTP_VERSION_30                3000
  
- #define NGX_HTTP_UNKNOWN                   0x0001
- #define NGX_HTTP_GET                       0x0002
- #define NGX_HTTP_HEAD                      0x0004
- #define NGX_HTTP_POST                      0x0008
- #define NGX_HTTP_PUT                       0x0010
- #define NGX_HTTP_DELETE                    0x0020
- #define NGX_HTTP_MKCOL                     0x0040
- #define NGX_HTTP_COPY                      0x0080
- #define NGX_HTTP_MOVE                      0x0100
- #define NGX_HTTP_OPTIONS                   0x0200
- #define NGX_HTTP_PROPFIND                  0x0400
- #define NGX_HTTP_PROPPATCH                 0x0800
- #define NGX_HTTP_LOCK                      0x1000
- #define NGX_HTTP_UNLOCK                    0x2000
- #define NGX_HTTP_PATCH                     0x4000
- #define NGX_HTTP_TRACE                     0x8000
+ #define NGX_HTTP_UNKNOWN                   0x00000001
+ #define NGX_HTTP_GET                       0x00000002
+ #define NGX_HTTP_HEAD                      0x00000004
+ #define NGX_HTTP_POST                      0x00000008
+ #define NGX_HTTP_PUT                       0x00000010
+ #define NGX_HTTP_DELETE                    0x00000020
+ #define NGX_HTTP_MKCOL                     0x00000040
+ #define NGX_HTTP_COPY                      0x00000080
+ #define NGX_HTTP_MOVE                      0x00000100
+ #define NGX_HTTP_OPTIONS                   0x00000200
+ #define NGX_HTTP_PROPFIND                  0x00000400
+ #define NGX_HTTP_PROPPATCH                 0x00000800
+ #define NGX_HTTP_LOCK                      0x00001000
+ #define NGX_HTTP_UNLOCK                    0x00002000
+ #define NGX_HTTP_PATCH                     0x00004000
+ #define NGX_HTTP_TRACE                     0x00008000
+ #define NGX_HTTP_CONNECT                   0x00010000
  
  #define NGX_HTTP_CONNECTION_CLOSE          1
  #define NGX_HTTP_CONNECTION_KEEP_ALIVE     2