nginx: fix leftover code that flood the logs

Stop flooding logs as stated at https://dev.openwrt.org/ticket/17317.

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 89a7ce99e9f7bf6222f2296f3246e3596502c873..e93326e5272014340307c04f870b2233a35c4dd4 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.4.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/

diff --git a/net/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch b/net/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
index 52c1ce7ff9840265558560011c2dad3069ae1d90..ba63834e878feef103a71f66f07e4b57ca03b81c 100644 (file)
--- a/net/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
+++ b/net/nginx/patches/400-nginx-1.4.x_proxy_protocol_patch_v2.patch
@@ -882,17 +882,6 @@ Index: nginx-1.4.7/src/http/ngx_http_request.c
  
  #if (NGX_HTTP_SSL)
  
-@@ -1291,6 +1368,10 @@ ngx_http_read_request_header(ngx_http_re
-     c = r->connection;
-     rev = c->read;
- 
-+fprintf(stderr, "DEBUG: pos: %p, last: %p, start: %p, end: %p\n",
-+              r->header_in->pos, r->header_in->last, r->header_in->start,
-+              r->header_in->end);
-+
-     n = r->header_in->last - r->header_in->pos;
- 
-     if (n > 0) {
 Index: nginx-1.4.7/src/http/ngx_http_upstream.c
 ===================================================================
 --- nginx-1.4.7.orig/src/http/ngx_http_upstream.c