summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-02 14:56:24 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-02 14:56:24 +0000
commit5a69751c30bd1f939dc6bf075b7ce57342ac7f11 (patch)
tree5485b0e09982b1c1200e195b3f622f50931e5a7a
parent8407669751574909c4814266179b1a7c9f826d93 (diff)
downloaduhttpd-5a69751c30bd1f939dc6bf075b7ce57342ac7f11.tar.gz
[package] uhttpd: add explicit stdin eof notification for Lua and CGI childs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@32027 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--uhttpd-cgi.c4
-rw-r--r--uhttpd-lua.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/uhttpd-cgi.c b/uhttpd-cgi.c
index 2f7ea7a..5e445ca 100644
--- a/uhttpd-cgi.c
+++ b/uhttpd-cgi.c
@@ -181,6 +181,10 @@ static bool uh_cgi_socket_cb(struct client *cl)
/* ... write to CGI process */
len = uh_raw_send(state->wfd, buf, len,
cl->server->conf->script_timeout);
+
+ /* explicit EOF notification for the child */
+ if (state->content_length <= 0)
+ close(state->wfd);
}
/* try to read data from child */
diff --git a/uhttpd-lua.c b/uhttpd-lua.c
index 7d602f7..e8d932b 100644
--- a/uhttpd-lua.c
+++ b/uhttpd-lua.c
@@ -298,9 +298,13 @@ static bool uh_lua_socket_cb(struct client *cl)
else
state->content_length = 0;
- /* ... write to CGI process */
+ /* ... write to Lua process */
len = uh_raw_send(state->wfd, buf, len,
cl->server->conf->script_timeout);
+
+ /* explicit EOF notification for the child */
+ if (state->content_length <= 0)
+ close(state->wfd);
}
/* try to read data from child */