From bd89c448b7e7beb15409e2abe2f174a36a7a0823 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@nginx.com>
Date: Tue, 14 Sep 2021 12:09:13 +0300
Subject: Removed NGX_OPENSSL_QUIC macro, NGX_QUIC is enough.

---
 auto/lib/openssl/conf | 4 +---
 src/core/ngx_core.h   | 2 +-
 src/http/ngx_http.c   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index f0dd1e1e8..61ba8d671 100644
--- 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 256836546..88db7dc98 100644
--- 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 e1604af60..c9aa3761b 100644
--- 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,
-- 
cgit