Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Revert "Rollback SPDY module and SSL config (TLSv1, TLSv1.1)"

Browse Source 
This reverts commit 33cd571e41.
This commit is contained in:
Hakase
2018-06-11 20:10:30 +09:00
parent ddb753fb83
commit 6dd57f72aa
20 changed files with 86 additions and 5864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/ngx_http.c
-27
View File
@@ -1199,9 +1199,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
#if (NGX_HTTP_V2)
ngx_uint_t http2;
#endif
#if (NGX_HTTP_SPDY)
ngx_uint_t spdy;
#endif
/*
* we cannot compare whole sockaddr struct's as kernel
@@ -1237,9 +1234,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
#if (NGX_HTTP_V2)
http2 = lsopt->http2 || addr[i].opt.http2;
#endif
#if (NGX_HTTP_SPDY)
spdy = lsopt->spdy || addr[i].opt.spdy;
#endif
if (lsopt->set) {
@@ -1274,9 +1268,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
#if (NGX_HTTP_V2)
addr[i].opt.http2 = http2;
#endif
#if (NGX_HTTP_SPDY)
addr[i].opt.spdy = spdy;
#endif
return NGX_OK;
}
@@ -1318,18 +1309,6 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
lsopt->addr);
}
#endif
#if (NGX_HTTP_SPDY && NGX_HTTP_SSL \
&& !defined TLSEXT_TYPE_application_layer_protocol_negotiation \
&& !defined TLSEXT_TYPE_next_proto_neg)
if (lsopt->spdy && lsopt->ssl) {
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
"nginx was built with OpenSSL that lacks ALPN "
"and NPN support, SPDY is not enabled for %s",
lsopt->addr);
}
#endif
addr = ngx_array_push(&port->addrs);
@@ -1824,9 +1803,6 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
#endif
#if (NGX_HTTP_V2)
addrs[i].conf.http2 = addr[i].opt.http2;
#endif
#if (NGX_HTTP_SPDY)
addrs[i].conf.spdy = addr[i].opt.spdy;
#endif
addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
@@ -1892,9 +1868,6 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
#endif
#if (NGX_HTTP_V2)
addrs6[i].conf.http2 = addr[i].opt.http2;
#endif
#if (NGX_HTTP_SPDY)
addrs6[i].conf.spdy = addr[i].opt.spdy;
#endif
addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;