diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-11 20:30:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-11 20:30:48 +0000 |
| commit | c50afe92ff5a00b07cff967efe7d022aaa4c591d (patch) | |
| tree | 0371a632b7abedbe7db1ea8dfebefb5d370d0630 /package | |
| parent | 75e39c51228b9e030a9914d2b80a99fcae8117df (diff) | |
| download | upstream-c50afe92ff5a00b07cff967efe7d022aaa4c591d.tar.gz upstream-c50afe92ff5a00b07cff967efe7d022aaa4c591d.tar.bz2 upstream-c50afe92ff5a00b07cff967efe7d022aaa4c591d.zip | |
oops... accidentally merged a broken patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6283 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/busybox/patches/420-httpd_sendcgi_fix.patch | 28 |
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 de4ecf6713..f2ed2f3e86 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) |