summaryrefslogtreecommitdiff
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
commita0b8f9998e1f791304629220a5ff3a084bb856fc (patch)
treef30cfa8923e269c79c745068c945631e8b9cc69f
parent5a69751c30bd1f939dc6bf075b7ce57342ac7f11 (diff)
downloaduhttpd-a0b8f9998e1f791304629220a5ff3a084bb856fc.tar.gz
[package] uhttpd: remove some dead code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@32028 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--uhttpd-cgi.c8
-rw-r--r--uhttpd-lua.c8
2 files changed, 2 insertions, 14 deletions
diff --git a/uhttpd-cgi.c b/uhttpd-cgi.c
index 5e445ca..ee1b80c 100644
--- a/uhttpd-cgi.c
+++ b/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/uhttpd-lua.c b/uhttpd-lua.c
index e8d932b..0b91b34 100644
--- a/uhttpd-lua.c
+++ b/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)))
{