comparison src/http/ngx_http.c @ 8889:61d0fa67b55e quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 03 Nov 2021 11:22:07 +0300
parents 7603284f7af5 61abb35bb8cf
children 33226ac61076
comparison
equal deleted inserted replaced
8888:6d1488b62dc5 8889:61d0fa67b55e
1358 return NGX_ERROR; 1358 return NGX_ERROR;
1359 } 1359 }
1360 } 1360 }
1361 1361
1362 #if (NGX_HTTP_V2 && NGX_HTTP_SSL \ 1362 #if (NGX_HTTP_V2 && NGX_HTTP_SSL \
1363 && !defined TLSEXT_TYPE_application_layer_protocol_negotiation \ 1363 && !defined TLSEXT_TYPE_application_layer_protocol_negotiation)
1364 && !defined TLSEXT_TYPE_next_proto_neg)
1365 1364
1366 if (lsopt->http2 && lsopt->ssl) { 1365 if (lsopt->http2 && lsopt->ssl) {
1367 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, 1366 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
1368 "nginx was built with OpenSSL that lacks ALPN " 1367 "nginx was built with OpenSSL that lacks ALPN "
1369 "and NPN support, HTTP/2 is not enabled for %V", 1368 "support, HTTP/2 is not enabled for %V",
1370 &lsopt->addr_text); 1369 &lsopt->addr_text);
1371 } 1370 }
1372 1371
1373 #endif 1372 #endif
1374 1373