summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-02 15:08:54 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-02 15:08:54 +0000
commit2498cec75c819c8cb77850b54c408bd71d32a46d (patch)
tree6dafb27d800f86cdd3e5cb5e71fd3162689ab023 /package
parentf76b15292874aa4ce5f175831d7b6fcba1f4eaf2 (diff)
[package] uhttpd: remove some dead code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32028 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/uhttpd/src/uhttpd-cgi.c8
-rw-r--r--package/uhttpd/src/uhttpd-lua.c8
2 files changed, 2 insertions, 14 deletions
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 5e445ca37..ee1b80cc7 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -283,13 +283,7 @@ static bool uh_cgi_socket_cb(struct client *cl)
}
}
- /* child has been marked dead by timeout or child handler, bail out */
- if (false && cl->dead)
- {
- D("CGI: Child(%d) is marked dead, returning\n", state->cl->proc.pid);
- goto out;
- }
-
+ /* got EOF or read error from child */
if ((len == 0) ||
((errno != EAGAIN) && (errno != EWOULDBLOCK) && (len == -1)))
{
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index e8d932b47..0b91b348f 100644
--- a/package/uhttpd/src/uhttpd-lua.c
+++ b/package/uhttpd/src/uhttpd-lua.c
@@ -316,13 +316,7 @@ static bool uh_lua_socket_cb(struct client *cl)
state->data_sent = true;
}
- /* child has been marked dead by timeout or child handler, bail out */
- if (false && cl->dead)
- {
- D("Lua: Child(%d) is marked dead, returning\n", state->cl->proc.pid);
- goto out;
- }
-
+ /* got EOF or read error from child */
if ((len == 0) ||
((errno != EAGAIN) && (errno != EWOULDBLOCK) && (len == -1)))
{