diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-11-03 11:22:07 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-11-03 11:22:07 +0300 |
| commit | bbd05ae252bce1907173d13c6e48d1bed71cd9ea (patch) | |
| tree | 6bca56a91f1d0a0b1c3ad4ac0d3c3ba2b4122468 /src/http/ngx_http.c | |
| parent | 8f8cb92e9229d75ea5816f35c6b4bfdfb253a486 (diff) | |
| parent | 3334585539168947650a37d74dd32973ab451d70 (diff) | |
| download | nginx-bbd05ae252bce1907173d13c6e48d1bed71cd9ea.tar.gz nginx-bbd05ae252bce1907173d13c6e48d1bed71cd9ea.zip | |
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index c9aa3761b..908e88103 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1360,13 +1360,12 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, } #if (NGX_HTTP_V2 && NGX_HTTP_SSL \ - && !defined TLSEXT_TYPE_application_layer_protocol_negotiation \ - && !defined TLSEXT_TYPE_next_proto_neg) + && !defined TLSEXT_TYPE_application_layer_protocol_negotiation) if (lsopt->http2 && lsopt->ssl) { ngx_conf_log_error(NGX_LOG_WARN, cf, 0, "nginx was built with OpenSSL that lacks ALPN " - "and NPN support, HTTP/2 is not enabled for %V", + "support, HTTP/2 is not enabled for %V", &lsopt->addr_text); } |