From ddb753fb83e932c41587b0b5ee16970ffa49fa02 Mon Sep 17 00:00:00 2001 From: Hakase Date: Mon, 11 Jun 2018 20:10:06 +0900 Subject: [PATCH] Revert "Fix spdy server header." This reverts commit 1d8d1778a9483dce00d8076d59e9178b8885e91e. --- src/http/ngx_http_spdy_filter_module.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c index 05cc999..377e935 100644 --- a/src/http/ngx_http_spdy_filter_module.c +++ b/src/http/ngx_http_spdy_filter_module.c @@ -177,12 +177,8 @@ ngx_http_spdy_header_filter(ngx_http_request_t *r) if (r->headers_out.server == NULL) { len += ngx_http_spdy_nv_nsize("server"); - if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) - len += ngx_http_spdy_nv_vsize(NGINX_SERVER_FULL); - else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) - len += ngx_http_spdy_nv_vsize(NGINX_SERVER_FULL_BUILD); - else - len += ngx_http_spdy_nv_vsize(NGINX_SERVER); + len += clcf->server_tokens ? ngx_http_spdy_nv_vsize(NGINX_VER) + : ngx_http_spdy_nv_vsize("nginx"); } if (r->headers_out.date == NULL) { @@ -332,13 +328,9 @@ ngx_http_spdy_header_filter(ngx_http_request_t *r) if (r->headers_out.server == NULL) { last = ngx_http_spdy_nv_write_name(last, "server"); - - if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) - last = ngx_http_spdy_nv_write_val(last, NGINX_SERVER_FULL); - else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) - last = ngx_http_spdy_nv_write_val(last, NGINX_SERVER_FULL_BUILD); - else - last = ngx_http_spdy_nv_write_val(last, NGINX_SERVER); + last = clcf->server_tokens + ? ngx_http_spdy_nv_write_val(last, NGINX_VER) + : ngx_http_spdy_nv_write_val(last, "nginx"); count++; }