summaryrefslogtreecommitdiffstats
path: root/package/uhttpd/src
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-27 01:47:36 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-27 01:47:36 +0000
commit2442fc33b90d1c5806b65738eada3d7af9230bc3 (patch)
tree1dfa5a2bc64308a8bf5973de7858f065ceeb3474 /package/uhttpd/src
parent410c95eb98f84c413a839bb2d1d6e9611f3e2d9f (diff)
[package] uhttpd: clear script timeout as soon as data is received from the child
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20501 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/src')
-rw-r--r--package/uhttpd/src/uhttpd-cgi.c12
-rw-r--r--package/uhttpd/src/uhttpd-lua.c12
2 files changed, 14 insertions, 10 deletions
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 4a30f2fc9..8bd22503d 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -360,6 +360,9 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
memset(hdr, 0, sizeof(hdr));
+ timeout.tv_sec = cl->server->conf->script_timeout;
+ timeout.tv_usec = 0;
+
#define ensure(x) \
do { if( x < 0 ) goto out; } while(0)
@@ -372,12 +375,11 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
FD_SET(rfd[0], &reader);
FD_SET(wfd[1], &writer);
- timeout.tv_sec = cl->server->conf->script_timeout;
- timeout.tv_usec = 0;
-
/* wait until we can read or write or both */
- if( select(fd_max, &reader, (content_length > -1) ? &writer : NULL, NULL, &timeout) > 0 )
- {
+ if( select(fd_max, &reader,
+ (content_length > -1) ? &writer : NULL, NULL,
+ (header_sent < 1) ? &timeout : NULL) > 0
+ ) {
/* ready to write to cgi program */
if( FD_ISSET(wfd[1], &writer) )
{
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index c1e749043..fcbdc6482 100644
--- a/package/uhttpd/src/uhttpd-lua.c
+++ b/package/uhttpd/src/uhttpd-lua.c
@@ -439,6 +439,9 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
data_sent = 0;
+ timeout.tv_sec = cl->server->conf->script_timeout;
+ timeout.tv_usec = 0;
+
/* I/O loop, watch our pipe ends and dispatch child reads/writes from/to socket */
while( 1 )
{
@@ -448,12 +451,11 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
FD_SET(rfd[0], &reader);
FD_SET(wfd[1], &writer);
- timeout.tv_sec = cl->server->conf->script_timeout;
- timeout.tv_usec = 0;
-
/* wait until we can read or write or both */
- if( select(fd_max, &reader, (content_length > -1) ? &writer : NULL, NULL, &timeout) > 0 )
- {
+ if( select(fd_max, &reader,
+ (content_length > -1) ? &writer : NULL, NULL,
+ (data_sent < 1) ? &timeout : NULL) > 0
+ ) {
/* ready to write to Lua child */
if( FD_ISSET(wfd[1], &writer) )
{