From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 3 Nov 2021 08:22:07 +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=bbd05ae252bce1907173d13c6e48d1bed71cd9ea;p=nginx.git

Merged with the default branch.
---

bbd05ae252bce1907173d13c6e48d1bed71cd9ea
diff --cc src/http/modules/ngx_http_ssl_module.c
index dbb5905df,c633f3464..f2a85f12e
--- a/src/http/modules/ngx_http_ssl_module.c
+++ b/src/http/modules/ngx_http_ssl_module.c
@@@ -443,49 -438,17 +441,47 @@@ ngx_http_ssl_alpn_select(ngx_ssl_conn_
      }
  #endif
  
 -#if (NGX_HTTP_V2)
 +#if (NGX_HTTP_V2 || NGX_HTTP_QUIC)
      hc = c->data;
 +#endif
  
 +#if (NGX_HTTP_V2)
      if (hc->addr_conf->http2) {
-         srv =
-            (unsigned char *) NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
-         srvlen = sizeof(NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
- 
+         srv = (unsigned char *) NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS;
+         srvlen = sizeof(NGX_HTTP_V2_ALPN_PROTO NGX_HTTP_ALPN_PROTOS) - 1;
      } else
 +#endif
 +#if (NGX_HTTP_QUIC)
 +    if (hc->addr_conf->quic) {
 +#if (NGX_HTTP_V3)
 +        if (hc->addr_conf->http3) {
 +            srv = (unsigned char *) NGX_HTTP_V3_ALPN_ADVERTISE;
 +            srvlen = sizeof(NGX_HTTP_V3_ALPN_ADVERTISE) - 1;
 +            fmt = NGX_HTTP_V3_ALPN_DRAFT_FMT;
 +
 +        } else
 +#endif
 +        {
 +            srv = (unsigned char *) NGX_HTTP_QUIC_ALPN_ADVERTISE;
 +            srvlen = sizeof(NGX_HTTP_QUIC_ALPN_ADVERTISE) - 1;
 +            fmt = NGX_HTTP_QUIC_ALPN_DRAFT_FMT;
 +        }
 +
 +        /* QUIC draft */
 +
 +        if (ngx_quic_version(c) > 1) {
 +            srv = ngx_pnalloc(c->pool, sizeof("\x05h3-xx") - 1);
 +            if (srv == NULL) {
 +                return SSL_TLSEXT_ERR_NOACK;
 +            }
 +            srvlen = ngx_sprintf(srv, fmt, ngx_quic_version(c)) - srv;
 +        }
 +
 +    } else
  #endif
      {
-         srv = (unsigned char *) NGX_HTTP_NPN_ADVERTISE;
-         srvlen = sizeof(NGX_HTTP_NPN_ADVERTISE) - 1;
+         srv = (unsigned char *) NGX_HTTP_ALPN_PROTOS;
+         srvlen = sizeof(NGX_HTTP_ALPN_PROTOS) - 1;
      }
  
      if (SSL_select_next_proto((unsigned char **) out, outlen, srv, srvlen,