diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-02 15:08:54 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-02 15:08:54 +0000 |
| commit | 61de624060bd6d2b1f9618185169b5ce65eb720e (patch) | |
| tree | 6dafb27d800f86cdd3e5cb5e71fd3162689ab023 | |
| parent | 4c82a595155b1758b7ddcc512e06f32e7641340e (diff) | |
| download | master-187ad058-61de624060bd6d2b1f9618185169b5ce65eb720e.tar.gz master-187ad058-61de624060bd6d2b1f9618185169b5ce65eb720e.tar.bz2 master-187ad058-61de624060bd6d2b1f9618185169b5ce65eb720e.zip | |
[package] uhttpd: remove some dead code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32028 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/uhttpd/src/uhttpd-cgi.c | 8 | ||||
| -rw-r--r-- | package/uhttpd/src/uhttpd-lua.c | 8 |
2 files changed, 2 insertions, 14 deletions
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))) { |