domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uhttpd: - make script timeout configurable - catch SIGCHLD to properly interrupt select() - flag listen and client sockets as close-on-exec

Browse Source 
SVN-Revision: 20500
This commit is contained in:
Jo-Philipp Wich
2010-03-27 00:00:33 +00:00
parent d7195c2293
commit 8c9b818a24
8 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/uhttpd/src/uhttpd-lua.c
View File

@@ -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;
}