aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/src/uhttpd-cgi.c
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-03-27 00:00:33 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-03-27 00:00:33 +0000
commit8c9b818a24045c15f40fc415cd1dde78c438555a (patch)
treea4f379b54fac4e4d63352eabd506927395f8c19f /package/uhttpd/src/uhttpd-cgi.c
parentd7195c229316346aae4ba5617c20308863a855c5 (diff)
downloadupstream-8c9b818a24045c15f40fc415cd1dde78c438555a.tar.gz
upstream-8c9b818a24045c15f40fc415cd1dde78c438555a.tar.bz2
upstream-8c9b818a24045c15f40fc415cd1dde78c438555a.zip
uhttpd: - make script timeout configurable - catch SIGCHLD to properly interrupt select() - flag listen and client sockets as close-on-exec
SVN-Revision: 20500
Diffstat (limited to 'package/uhttpd/src/uhttpd-cgi.c')
-rw-r--r--package/uhttpd/src/uhttpd-cgi.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 5565197ca7..4a30f2fc9a 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -372,7 +372,7 @@ 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 = 15;
+ timeout.tv_sec = cl->server->conf->script_timeout;
timeout.tv_usec = 0;
/* wait until we can read or write or both */
@@ -538,11 +538,18 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
}
}
- /* no activity for 15 seconds... looks dead */
+ /* timeout exceeded or interrupted by SIGCHLD */
else
{
- ensure(uh_http_sendhf(cl, 504, "Gateway Timeout",
- "The CGI script took too long to produce a response"));
+ if( (errno != EINTR) && ! header_sent )
+ {
+ ensure(uh_http_sendhf(cl, 504, "Gateway Timeout",
+ "The CGI script took too long to produce "
+ "a response"));
+ }
+
+ /* send final chunk if we're in chunked transfer mode */
+ ensure(uh_http_send(cl, req, "", 0));
break;
}