Mercurial > hg > nginx

diff src/http/ngx_http_header_filter_module.c @ 6449:e5076b96fd01
Reconsidered server_tokens with an empty value. An empty value will be treated as "off".
author: Ruslan Ermilov <ru@nginx.com>
date: Tue, 22 Mar 2016 15:52:28 +0300
parents: 6b72414dfb4f
children: 155871d773cc
--- a/src/http/ngx_http_header_filter_module.c
+++ b/src/http/ngx_http_header_filter_module.c
@@ -295,12 +295,12 @@ ngx_http_header_filter(ngx_http_request_
                 return NGX_ERROR;
             }
 
-            if (tokens.len == 3
-                && ngx_strncmp(tokens.data, "off", 3) == 0)
+            if (tokens.len == 0
+                || (tokens.len == 3 && ngx_strncmp(tokens.data, "off", 3) == 0))
             {
                 ngx_str_set(&tokens, ngx_http_server_string);
 
-            } else if (tokens.len) {
+            } else {
                 ngx_str_set(&tokens, ngx_http_server_full_string);
             }
         }
@@ -481,7 +481,7 @@ ngx_http_header_filter(ngx_http_request_
     }
     *b->last++ = CR; *b->last++ = LF;
 
-    if (r->headers_out.server == NULL && tokens.len) {
+    if (r->headers_out.server == NULL) {
         b->last = ngx_cpymem(b->last, tokens.data, tokens.len);
     }