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

Remove SPDY Module

Browse Source
This commit is contained in:
Hakase
2018-04-10 01:35:45 +09:00
parent 1e97fe4be5
commit ae4394f371
19 changed files with 11 additions and 5875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/modules/ngx_http_ssl_module.c
+6 -48
View File
@@ -387,10 +387,10 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
#if (NGX_DEBUG)
unsigned int i;
#endif
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY)
#if (NGX_HTTP_V2)
ngx_http_connection_t *hc;
#endif
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY || NGX_DEBUG)
#if (NGX_HTTP_V2 || NGX_DEBUG)
ngx_connection_t *c;
c = ngx_ssl_get_connection(ssl_conn);
@@ -404,20 +404,9 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
}
#endif
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY)
hc = c->data;
#endif
#if (NGX_HTTP_V2 && NGX_HTTP_SPDY)
if (hc->addr_conf->http2 && hc->addr_conf->spdy) {
srv = (unsigned char *) NGX_HTTP_V2_ALPN_ADVERTISE
NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
srvlen = sizeof(NGX_HTTP_V2_ALPN_ADVERTISE NGX_SPDY_NPN_ADVERTISE
NGX_HTTP_NPN_ADVERTISE) - 1;
} else
#endif
#if (NGX_HTTP_V2)
hc = c->data;
if (hc->addr_conf->http2) {
srv =
(unsigned char *) NGX_HTTP_V2_ALPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
@@ -425,13 +414,6 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
} else
#endif
#if (NGX_HTTP_SPDY)
if (hc->addr_conf->spdy) {
srv = (unsigned char *) NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
srvlen = sizeof(NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
} else
#endif
{
srv = (unsigned char *) NGX_HTTP_NPN_ADVERTISE;
srvlen = sizeof(NGX_HTTP_NPN_ADVERTISE) - 1;
@@ -459,32 +441,19 @@ static int
ngx_http_ssl_npn_advertised(ngx_ssl_conn_t *ssl_conn,
const unsigned char **out, unsigned int *outlen, void *arg)
{
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY || NGX_DEBUG)
#if (NGX_HTTP_V2 || NGX_DEBUG)
ngx_connection_t *c;
c = ngx_ssl_get_connection(ssl_conn);
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "SSL NPN advertised");
#endif
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY)
#if (NGX_HTTP_V2)
{
ngx_http_connection_t *hc;
hc = c->data;
#endif
#if (NGX_HTTP_V2 && NGX_HTTP_SPDY)
if (hc->addr_conf->http2 && hc->addr_conf->spdy) {
*out = (unsigned char *) NGX_HTTP_V2_NPN_ADVERTISE
NGX_SPDY_NPN_ADVERTISE
NGX_HTTP_NPN_ADVERTISE;
*outlen = sizeof(NGX_HTTP_V2_NPN_ADVERTISE NGX_SPDY_NPN_ADVERTISE
NGX_HTTP_NPN_ADVERTISE) - 1;
return SSL_TLSEXT_ERR_OK;
} else
#endif
#if (NGX_HTTP_V2)
if (hc->addr_conf->http2) {
*out =
(unsigned char *) NGX_HTTP_V2_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
@@ -492,17 +461,6 @@ ngx_http_ssl_npn_advertised(ngx_ssl_conn_t *ssl_conn,
return SSL_TLSEXT_ERR_OK;
}
#endif
#if (NGX_HTTP_SPDY)
else if (hc->addr_conf->spdy) {
*out = (unsigned char *) NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE;
*outlen = sizeof(NGX_SPDY_NPN_ADVERTISE NGX_HTTP_NPN_ADVERTISE) - 1;
return SSL_TLSEXT_ERR_OK;
}
#endif
#if (NGX_HTTP_V2 || NGX_HTTP_SPDY)
}
#endif