From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 10 Feb 2007 17:16:10 +0000 (+0000)
Subject: revert httpd header handling code to the one from busybox 1.3.1 - fixes problems... 
X-Git-Tag: reboot~29956
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9b0e829bfce93025f1e8e64de12799efdf8632f8;p=openwrt%2Fstaging%2Fblogic.git

revert httpd header handling code to the one from busybox 1.3.1 - fixes problems with cgis and custom headers

SVN-Revision: 6281
---

diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index 1a55d8ab6500..b0f56364382e 100644
--- a/package/busybox/patches/410-httpd_cgi_headers.patch
+++ b/package/busybox/patches/410-httpd_cgi_headers.patch
@@ -1,5 +1,6 @@
+diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
 --- busybox.old/networking/httpd.c	2007-01-19 22:22:59.000000000 +0100
-+++ busybox.dev/networking/httpd.c	2007-02-01 17:00:56.000000000 +0100
++++ busybox.dev/networking/httpd.c	2007-02-10 16:36:50.950661760 +0100
 @@ -1224,7 +1224,7 @@
  				 * "chopped up into small chunks" syndrome here */
  				rbuf[count] = '\0';
@@ -9,3 +10,16 @@
  				if (memcmp(rbuf, HTTP_200, 4) != 0) {
  					/* there is no "HTTP", do it ourself */
  					full_write(s, HTTP_200, sizeof(HTTP_200)-1);
+@@ -1235,9 +1235,9 @@
+ 				 * echo -en "Location: http://www.busybox.net\r\n"
+ 				 * echo -en "\r\n"
+ 				 */
+-				//if (!strstr(rbuf, "ontent-")) {
+-				//	full_write(s, "Content-type: text/plain\r\n\r\n", 28);
+-				//}
++				if (!strstr(rbuf, "ontent-")) {
++					full_write(s, "Content-type: text/plain\r\n\r\n", 28);
++				}
+ 				firstLine = 0;
+ 			}
+ 			if (full_write(s, rbuf, count) != count)