Mercurial > hg > nginx

diff src/http/ngx_http_core_module.c @ 8922:be08b858086a quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: http3_hq directive and NGX_HTTP_V3_HQ macro. Listen quic parameter is no longer supported.
author Roman Arutyunyan <arut@nginx.com>
date Sat, 04 Dec 2021 10:52:55 +0300
parents 33226ac61076
children eaf356a35f5d
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4096,22 +4096,8 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx
 #endif
         }
 
-        if (ngx_strcmp(value[n].data, "quic") == 0) {
-#if (NGX_HTTP_V3)
-            lsopt.quic = 1;
-            lsopt.type = SOCK_DGRAM;
-            continue;
-#else
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "the \"quic\" parameter requires "
-                               "ngx_http_v3_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;
@@ -4224,22 +4210,12 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx
         return NGX_CONF_ERROR;
     }
 
-#if (NGX_HTTP_SSL)
-
-#if (NGX_HTTP_V3)
+#if (NGX_HTTP_SSL && NGX_HTTP_V3)
     if (lsopt.ssl && lsopt.http3) {
         return "\"ssl\" parameter is incompatible with \"http3\"";
     }
 #endif
 
-#if (NGX_HTTP_V3)
-    if (lsopt.ssl && lsopt.quic) {
-        return "\"ssl\" parameter is incompatible with \"quic\"";
-    }
-#endif
-
-#endif
-
     for (n = 0; n < u.naddrs; n++) {
         lsopt.sockaddr = u.addrs[n].sockaddr;
         lsopt.socklen = u.addrs[n].socklen;