Configure: check for QUIC 0-RTT support at compile time.

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index a9cb0094e3111d84d9c3a88535a24ce4445789d2..8b84c02a46851aa956ab411514d27af33031b319 100644 (file)
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -165,13 +165,4 @@ with nginx by using --with-openssl=<path> option.
 END
         exit 1
     fi
-
-    ngx_feature="OpenSSL QUIC 0-RTT context"
-    ngx_feature_name="NGX_OPENSSL_QUIC_ZRTT_CTX"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <openssl/ssl.h>"
-    ngx_feature_path=
-    ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD"
-    ngx_feature_test="SSL_set_quic_early_data_context(NULL, NULL, 0)"
-    . auto/feature
 fi

diff --git a/src/event/quic/ngx_event_quic_ssl.c b/src/event/quic/ngx_event_quic_ssl.c
index f589d74ac160f1262e74a0aa5a8b32ad21f80e28..6e2377eac48969ea06a914bcebc6aedde85ccdc3 100644 (file)
--- a/src/event/quic/ngx_event_quic_ssl.c
+++ b/src/event/quic/ngx_event_quic_ssl.c
@@ -549,7 +549,7 @@ ngx_quic_init_connection(ngx_connection_t *c)
         return NGX_ERROR;
     }
 
-#if (NGX_OPENSSL_QUIC_ZRTT_CTX)
+#if BORINGSSL_API_VERSION >= 11
     if (SSL_set_quic_early_data_context(ssl_conn, p, clen) == 0) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
                       "quic SSL_set_quic_early_data_context() failed");