From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 17 Feb 2021 11:48:35 +0000 (+0300)
Subject: Merged with the default branch.
X-Git-Tag: release-1.25.0~4^2~405
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=8ca2f73073da431d8e747589eac5b49a7c0faa5b;p=nginx.git

Merged with the default branch.
---

8ca2f73073da431d8e747589eac5b49a7c0faa5b
diff --cc src/http/ngx_http_core_module.c
index d4e1910bf,67476e7d7..25339130e
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@@ -4079,41 -4078,6 +4079,33 @@@ ngx_http_core_listen(ngx_conf_t *cf, ng
  #endif
          }
  
 +        if (ngx_strcmp(value[n].data, "quic") == 0) {
 +#if (NGX_HTTP_QUIC)
 +            lsopt.quic = 1;
 +            lsopt.type = SOCK_DGRAM;
 +            continue;
 +#else
 +            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 +                               "the \"quic\" parameter requires "
 +                               "ngx_http_quic_module");
 +            return NGX_CONF_ERROR;
 +#endif
 +        }
 +
 +        if (ngx_strcmp(value[n].data, "http3") == 0) {
 +#if (NGX_HTTP_V3)
 +            lsopt.quic = 1;
 +            lsopt.http3 = 1;
 +            lsopt.type = SOCK_DGRAM;
 +            continue;
 +#else
 +            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 +                               "the \"http3\" parameter requires "
 +                               "ngx_http_v3_module");
 +            return NGX_CONF_ERROR;
 +#endif
 +        }
 +
-         if (ngx_strcmp(value[n].data, "spdy") == 0) {
-             ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-                                "invalid parameter \"spdy\": "
-                                "ngx_http_spdy_module was superseded "
-                                "by ngx_http_v2_module");
-             continue;
-         }
- 
          if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
  
              if (ngx_strcmp(&value[n].data[13], "on") == 0) {