Merged with the default branch.

diff --cc src/core/ngx_connection.c
Simple merge

diff --cc src/core/ngx_connection.h
Simple merge

diff --cc src/http/ngx_http.c
Simple merge

diff --cc src/http/ngx_http_core_module.c
index d4e1910bfb33a4c7d796f0eab6a60c6b264eb2b0,67476e7d7ccf35e7b732e373a244882cb1dc584c..25339130e77d1eb4b22e99e73187644513c38cd9
--- 1/src/http/ngx_http_core_module.c
--- 2/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, "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_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_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
  
              if (ngx_strcmp(&value[n].data[13], "on") == 0) {

diff --cc src/http/ngx_http_request.c
Simple merge

diff --cc src/http/ngx_http_upstream.c
Simple merge