EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

oops... accidentally merged a broken patch

Browse Source 
SVN-Revision: 6283
This commit is contained in:
Felix Fietkau 2007-02-11 20:30:48 +00:00
parent 782096a1fe
commit 156eea58d8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/busybox/patches/420-httpd_sendcgi_fix.patch
View File

@ -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)