--- nginx-1.6.1/src/http/ngx_http_header_filter_module.c
+++ nginx-1.6.1/src/http/ngx_http_header_filter_module.c
@@ -46,8 +46,8 @@
 };
 
 
-static char ngx_http_server_string[] = "Server: nginx" CRLF;
-static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
+static char ngx_http_server_string[] = "";
+static char ngx_http_server_full_string[] = "";
 
 
 static ngx_str_t ngx_http_status_lines[] = {
@@ -278,8 +278,8 @@
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     if (r->headers_out.server == NULL) {
-        len += clcf->server_tokens ? sizeof(ngx_http_server_full_string) - 1:
-                                     sizeof(ngx_http_server_string) - 1;
+        len += clcf->server_tokens ? sizeof(ngx_http_server_full_string) - 0:
+                                     sizeof(ngx_http_server_string) - 0;
     }
 
     if (r->headers_out.date == NULL) {
--- nginx-1.6.1/src/http/ngx_http_special_response.c
+++ nginx-1.6.1/src/http/ngx_http_special_response.c
@@ -19,14 +19,14 @@
 
 
 static u_char ngx_http_error_full_tail[] =
-"<hr><center>" NGINX_VER "</center>" CRLF
+"<hr><center>127.0.0.1</center>" CRLF
 "</body>" CRLF
 "</html>" CRLF
 ;
 
 
 static u_char ngx_http_error_tail[] =
-"<hr><center>nginx</center>" CRLF
+"<hr><center>localhost</center>" CRLF
 "</body>" CRLF
 "</html>" CRLF
 ;
--- nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c
+++ nginx-1.9.5/src/http/v2/ngx_http_v2_filter_module.c
@@ -212,10 +212,11 @@
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-    if (r->headers_out.server == NULL) {
+/*  if (r->headers_out.server == NULL) {
         len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
                                        : ngx_http_v2_literal_size("nginx");
     }
+*/
 
     if (r->headers_out.date == NULL) {
         len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT");
@@ -413,14 +414,14 @@
     if (r->headers_out.server == NULL) {
         *b->last++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
 
-        if (clcf->server_tokens) {
+/*      if (clcf->server_tokens) {
             *b->last++ = sizeof(NGINX_VER) - 1;
             b->last = ngx_cpymem(b->last, NGINX_VER, sizeof(NGINX_VER) - 1);
 
         } else {
             *b->last++ = sizeof("nginx") - 1;
             b->last = ngx_cpymem(b->last, "nginx", sizeof("nginx") - 1);
-        }
+        } */
     }
 
     if (r->headers_out.date == NULL) {