diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 00:00:33 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-27 00:00:33 +0000 |
| commit | 99e8e7cf2f2c856ac67b2b0455a8b10b659a1ab5 (patch) | |
| tree | efa53486b6d67774f4641dea35ec97e78744b298 /package/uhttpd/src/uhttpd-lua.c | |
| parent | 78c616da82979a2bbf96a8792680278cf641a23a (diff) | |
| download | master-187ad058-99e8e7cf2f2c856ac67b2b0455a8b10b659a1ab5.tar.gz master-187ad058-99e8e7cf2f2c856ac67b2b0455a8b10b659a1ab5.tar.bz2 master-187ad058-99e8e7cf2f2c856ac67b2b0455a8b10b659a1ab5.zip | |
[package] uhttpd:
- make script timeout configurable
- catch SIGCHLD to properly interrupt select()
- flag listen and client sockets as close-on-exec
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20500 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, 8 insertions, 4 deletions
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c index ab09841cd6..c1e7490438 100644 --- a/package/uhttpd/src/uhttpd-lua.c +++ b/package/uhttpd/src/uhttpd-lua.c @@ -448,7 +448,7 @@ 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 = 15; + timeout.tv_sec = cl->server->conf->script_timeout; timeout.tv_usec = 0; /* wait until we can read or write or both */ @@ -512,11 +512,15 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L) } } - /* no activity for 15 seconds... looks dead */ + /* timeout exceeded or interrupted by SIGCHLD */ else { - ensure(uh_http_sendhf(cl, 504, "Gateway Timeout", - "The Lua handler took too long to produce a response")); + if( (errno != EINTR) && ! data_sent ) + { + ensure(uh_http_sendhf(cl, 504, "Gateway Timeout", + "The Lua script took too long to produce " + "a response")); + } break; } |