ludra/nginx-build
1
0 Fork 0
forked from Hakase/nginx-build
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix spdy server header."

Browse Source 
This reverts commit 1d8d1778a9.
This commit is contained in:
Hakase
2018-06-11 20:10:06 +09:00
parent 41d2f00b67
commit ddb753fb83
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/ngx_http_spdy_filter_module.c
+5 -13
View File
@@ -177,12 +177,8 @@ ngx_http_spdy_header_filter(ngx_http_request_t *r)
if (r->headers_out.server == NULL) { if (r->headers_out.server == NULL) {
len += ngx_http_spdy_nv_nsize("server"); len += ngx_http_spdy_nv_nsize("server");
if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) len += clcf->server_tokens ? ngx_http_spdy_nv_vsize(NGINX_VER)
len += ngx_http_spdy_nv_vsize(NGINX_SERVER_FULL); : ngx_http_spdy_nv_vsize("nginx");
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);
} }
if (r->headers_out.date == NULL) { 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) { if (r->headers_out.server == NULL) {
last = ngx_http_spdy_nv_write_name(last, "server"); last = ngx_http_spdy_nv_write_name(last, "server");
last = clcf->server_tokens
if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) ? ngx_http_spdy_nv_write_val(last, NGINX_VER)
last = ngx_http_spdy_nv_write_val(last, NGINX_SERVER_FULL); : ngx_http_spdy_nv_write_val(last, "nginx");
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);
count++; count++;
} }