diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 01:47:36 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 01:47:36 +0000 |
commit | c111766893da87452e7f1ee2bed9a59154da33c2 (patch) | |
tree | 1dfa5a2bc64308a8bf5973de7858f065ceeb3474 /package/uhttpd/src/uhttpd-lua.c | |
parent | 99e8e7cf2f2c856ac67b2b0455a8b10b659a1ab5 (diff) | |
download | upstream-c111766893da87452e7f1ee2bed9a59154da33c2.tar.gz upstream-c111766893da87452e7f1ee2bed9a59154da33c2.tar.bz2 upstream-c111766893da87452e7f1ee2bed9a59154da33c2.zip |
[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/uhttpd-lua.c')
-rw-r--r-- | package/uhttpd/src/uhttpd-lua.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c index c1e7490438..fcbdc64825 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) ) { |