aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-10 17:16:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-10 17:16:10 +0000
commita0e12aecbbdd3aed60fd8549e385f14249c5f468 (patch)
treefeea56ad0b32142afa9fa51a0af6de5c4e6214c7 /package
parenta94d2be696b19383fa65ba53a22c862c73508c2b (diff)
downloadmaster-187ad058-a0e12aecbbdd3aed60fd8549e385f14249c5f468.tar.gz
master-187ad058-a0e12aecbbdd3aed60fd8549e385f14249c5f468.tar.bz2
master-187ad058-a0e12aecbbdd3aed60fd8549e385f14249c5f468.zip
revert httpd header handling code to the one from busybox 1.3.1 - fixes problems with cgis and custom headers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6281 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/busybox/patches/410-httpd_cgi_headers.patch16
1 files changed, 15 insertions, 1 deletions
diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index 1a55d8ab65..b0f5636438 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)