diff options
author | Stuart Cardall <developer@it-offshore.co.uk> | 2017-03-17 21:18:20 +0000 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-21 12:59:42 +0100 |
commit | 89e1b4d9204770c581b0c02bf71d1ba6b70e1778 (patch) | |
tree | 41f2a467a13aeb5d7ea9671b1ee854f782c6c509 /testing/nginx-naxsi/anonymise.patch | |
parent | f54320b1b9d7fdd21776978a192b85b04079ad2f (diff) | |
download | aports-89e1b4d9204770c581b0c02bf71d1ba6b70e1778.tar.bz2 aports-89e1b4d9204770c581b0c02bf71d1ba6b70e1778.tar.xz |
testing/nginx-naxsi: => 1.11.10 / naxsi 0.55.3 / use supervise-daemon
* initd now uses supervise-daemon for service supervision
* removes duplicate --with-http_realip_module
* removes scgi_params & uwsgi_params as the servers are disabled
Diffstat (limited to 'testing/nginx-naxsi/anonymise.patch')
-rw-r--r-- | testing/nginx-naxsi/anonymise.patch | 91 |
1 files changed, 45 insertions, 46 deletions
diff --git a/testing/nginx-naxsi/anonymise.patch b/testing/nginx-naxsi/anonymise.patch index 17bca99b51..8b6f9c2ba1 100644 --- a/testing/nginx-naxsi/anonymise.patch +++ b/testing/nginx-naxsi/anonymise.patch @@ -1,30 +1,34 @@ ---- 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 @@ +--- nginx-1.11.10/src/http/ngx_http_header_filter_module.c ++++ nginx-1.11.10/src/http/ngx_http_header_filter_module.c.new +@@ -46,9 +46,9 @@ }; --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 u_char ngx_http_server_string[] = "Server: nginx" CRLF; +-static u_char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF; +-static u_char ngx_http_server_build_string[] = "Server: " NGINX_VER_BUILD CRLF; ++static u_char ngx_http_server_string[] = ""; ++static u_char ngx_http_server_full_string[] = ""; ++static u_char ngx_http_server_build_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); +@@ -276,10 +276,10 @@ 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 (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) { +- len += sizeof(ngx_http_server_full_string) - 1; ++ len += sizeof(ngx_http_server_full_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 @@ + } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) { +- len += sizeof(ngx_http_server_build_string) - 1; ++ len += sizeof(ngx_http_server_build_string) - 0; + + } else { + len += sizeof(ngx_http_server_string) - 1; +--- nginx-1.11.10/src/http/ngx_http_special_response.c ++++ nginx-1.11.10/src/http/ngx_http_special_response.c.new +@@ -19,21 +19,21 @@ static u_char ngx_http_error_full_tail[] = @@ -35,42 +39,37 @@ ; + static u_char ngx_http_error_build_tail[] = +-"<hr><center>" NGINX_VER_BUILD "</center>" CRLF ++"<hr><center>1.0.0</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.12/src/http/v2/ngx_http_v2_filter_module.c -+++ nginx-1.9.12/src/http/v2/ngx_http_v2_filter_module.c.new -@@ -229,9 +229,9 @@ - +--- nginx-1.11.10/src/http/v2/ngx_http_v2_filter_module.c ++++ nginx-1.11.10/src/http/v2/ngx_http_v2_filter_module.c.new +@@ -236,16 +236,7 @@ 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 ? nginx_ver_len : sizeof(nginx)); -- } -+ } */ - - if (r->headers_out.date == NULL) { - len += 1 + ngx_http_v2_literal_size("Wed, 31 Dec 1986 18:00:00 GMT"); -@@ -434,7 +434,7 @@ - pos = ngx_sprintf(pos, "%03ui", r->headers_out.status); + if (r->headers_out.server == NULL) { +- +- if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_ON) { +- len += 1 + nginx_ver_len; +- +- } else if (clcf->server_tokens == NGX_HTTP_SERVER_TOKENS_BUILD) { +- len += 1 + nginx_ver_build_len; +- +- } else { +- len += 1 + sizeof(nginx); +- } ++ len += 1 + sizeof(nginx); } -- if (r->headers_out.server == NULL) { -+/* if (r->headers_out.server == NULL) { - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0, - "http2 output header: \"server: %s\"", - clcf->server_tokens ? NGINX_VER : "nginx"); -@@ -453,7 +453,7 @@ - } else { - pos = ngx_cpymem(pos, nginx, sizeof(nginx)); - } -- } -+ } */ - if (r->headers_out.date == NULL) { - ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0, - |