summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-11 20:30:48 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-11 20:30:48 +0000
commit2b0cca7c68cf82c7cc67581519065df2bf6bb600 (patch)
tree0371a632b7abedbe7db1ea8dfebefb5d370d0630
parentbd6d44c5f711557d203086150b21a8a240bff38e (diff)
oops... accidentally merged a broken patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6283 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/patches/420-httpd_sendcgi_fix.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/package/busybox/patches/420-httpd_sendcgi_fix.patch b/package/busybox/patches/420-httpd_sendcgi_fix.patch
index de4ecf671..f2ed2f3e8 100644
--- a/package/busybox/patches/420-httpd_sendcgi_fix.patch
+++ b/package/busybox/patches/420-httpd_sendcgi_fix.patch
@@ -1,17 +1,17 @@
-diff -urN busybox-1.4.0/networking/httpd.c busybox-1.4.0.orig/networking/httpd.c
---- busybox-1.4.0/networking/httpd.c 2007-02-11 15:07:41.000000000 -0500
-+++ busybox-1.4.0.orig/networking/httpd.c 2007-02-11 15:07:32.000000000 -0500
-@@ -1213,10 +1213,9 @@
+diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
+--- busybox.old/networking/httpd.c 2007-02-10 16:36:50.950661000 +0100
++++ busybox.dev/networking/httpd.c 2007-02-11 21:24:52.026742384 +0100
+@@ -1211,9 +1211,10 @@
#if PIPESIZE >= MAX_MEMORY_BUFF
# error "PIPESIZE >= MAX_MEMORY_BUFF"
#endif
-- /* reverted back to safe_read, otherwise httpd may block if the */
-- /* cgi-script outputs page date before it has fully received all */
-- /* (eg POST) data */
-- count = safe_read(inFd, rbuf, PIPESIZE);
-+ /* NB: was safe_read. If it *has to be* safe_read, */
-+ /* please explain why in this comment... */
-+ count = full_read(inFd, rbuf, PIPESIZE);
- if (count == 0)
- break; /* closed */
- if (count < 0)
+- /* NB: was safe_read. If it *has to be* safe_read, */
+- /* please explain why in this comment... */
+- count = full_read(inFd, rbuf, PIPESIZE);
++ /* reverted back to safe_read, otherwise httpd may block if the */
++ /* cgi-script outputs page date before it has fully received all */
++ /* (eg POST) data */
++ count = safe_read(inFd, rbuf, PIPESIZE);
+ if (count == 0)
+ break; /* closed */
+ if (count < 0)