Removed NGX_OPENSSL_QUIC macro, NGX_QUIC is enough.

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index f0dd1e1e8812fe8d7f28e4786e68c4d1557a700d..61ba8d671d5a9b5958b75b4b435115bca097ae20 100644 (file)
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -145,7 +145,7 @@ fi
 if [ $USE_OPENSSL_QUIC = YES ]; then
 
     ngx_feature="OpenSSL QUIC support"
-    ngx_feature_name="NGX_OPENSSL_QUIC"
+    ngx_feature_name="NGX_QUIC"
     ngx_feature_run=no
     ngx_feature_incs="#include <openssl/ssl.h>"
     ngx_feature_path=
@@ -165,8 +165,6 @@ with nginx by using --with-openssl=<path> option.
 END
         exit 1
     fi
-
-    have=NGX_QUIC . auto/have
 fi
 
 

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index 256836546b8be4c56f269092be07d5a9fedc1fa4..88db7dc98512074e1937fa91f4b6199b16459586 100644 (file)
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -83,7 +83,7 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
 #include <ngx_resolver.h>
 #if (NGX_OPENSSL)
 #include <ngx_event_openssl.h>
-#if (NGX_OPENSSL_QUIC)
+#if (NGX_QUIC)
 #include <ngx_event_quic.h>
 #endif
 #endif

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index e1604af600e81c731fe7c4bcbff10b2499de8041..c9aa3761bdc2bb0eb895285b66f741bfc2594ea9 100644 (file)
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1372,7 +1372,7 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 
 #endif
 
-#if (NGX_HTTP_QUIC && !defined NGX_OPENSSL_QUIC)
+#if (NGX_HTTP_QUIC && !defined NGX_QUIC)
 
     if (lsopt->quic) {
         ngx_conf_log_error(NGX_LOG_WARN, cf, 0,