From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 2 Jun 2012 15:08:54 +0000 (+0000)
Subject: uhttpd: remove some dead code
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23eaea57add2f1c2a55a609b4e48c131a7bec6c7;p=openwrt%2Fstaging%2Fstintel.git

uhttpd: remove some dead code

SVN-Revision: 32028
---

diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 5e445ca372..ee1b80cc7f 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 e8d932b47b..0b91b348f4 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)))
 	{