Nginx/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-21 16:28:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed NGX_OPENSSL_QUIC macro, NGX_QUIC is enough.

Browse Source
This commit is contained in:
Ruslan Ermilov 2021-09-14 12:09:13 +03:00
parent 10cafa75a4
commit bd89c448b7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/lib/openssl/conf
View File

@ -145,7 +145,7 @@ fi
if [ $USE_OPENSSL_QUIC = YES ]; then if [ $USE_OPENSSL_QUIC = YES ]; then
ngx_feature="OpenSSL QUIC support" ngx_feature="OpenSSL QUIC support"
ngx_feature_name="NGX_OPENSSL_QUIC" ngx_feature_name="NGX_QUIC"
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <openssl/ssl.h>" ngx_feature_incs="#include <openssl/ssl.h>"
ngx_feature_path= ngx_feature_path=
@ -165,8 +165,6 @@ with nginx by using --with-openssl=<path> option.
END END
exit 1 exit 1
fi fi
have=NGX_QUIC . auto/have
fi fi

2
src/core/ngx_core.h
View File

@ -83,7 +83,7 @@ typedef void (*ngx_connection_handler_pt)(ngx_connection_t *c);
#include <ngx_resolver.h> #include <ngx_resolver.h>
#if (NGX_OPENSSL) #if (NGX_OPENSSL)
#include <ngx_event_openssl.h> #include <ngx_event_openssl.h>
#if (NGX_OPENSSL_QUIC) #if (NGX_QUIC)
#include <ngx_event_quic.h> #include <ngx_event_quic.h>
#endif #endif
#endif #endif

2
src/http/ngx_http.c
View File

@ -1372,7 +1372,7 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
#endif #endif
#if (NGX_HTTP_QUIC && !defined NGX_OPENSSL_QUIC) #if (NGX_HTTP_QUIC && !defined NGX_QUIC)
if (lsopt->quic) { if (lsopt->quic) {
ngx_conf_log_error(NGX_LOG_WARN, cf, 0, ngx_conf_log_error(NGX_LOG_WARN, cf, 0,