firmware-utils/mktplinkfw: add support for the TL-MR3220 v1

[openwrt.git] / package / busybox / patches / 410-httpd_cgi_headers.patch

diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index b0f5636..b47751a 100644 (file)
--- a/package/busybox/patches/410-httpd_cgi_headers.patch
+++ b/package/busybox/patches/410-httpd_cgi_headers.patch
@@ -1,25 +1,16 @@
-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-10 16:36:50.950661760 +0100
-@@ -1224,7 +1224,7 @@
-                                * "chopped up into small chunks" syndrome here */
-                               rbuf[count] = '\0';
-                               /* check to see if the user script added headers */
--#define HTTP_200 "HTTP/1.0 200 OK\r\n\r\n"
-+#define HTTP_200 "HTTP/1.0 200 OK\r\n"
-                               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)
+--- a/networking/httpd.c
++++ b/networking/httpd.c
+@@ -1255,10 +1255,10 @@ static NOINLINE void cgi_io_loop_and_exi
+                                               if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
+                                                       break;
+                                       }
+-                                      /* Commented out:
+-                                      if (!strstr(rbuf, "ontent-")) {
+-                                              full_write(s, "Content-type: text/plain\r\n\r\n", 28);
++                                      if (!strstr(rbuf, "ontent-") && !strstr(rbuf, "ocation:")) {
++                                              full_write(1, "Content-type: text/plain\r\n\r\n", 28);
+                                       }
++                                      /* Previously commented out:
+                                        * Counter-example of valid CGI without Content-type:
+                                        * echo -en "HTTP/1.0 302 Found\r\n"
+                                        * echo -en "Location: http://www.busybox.net\r\n"