diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-27 01:47:36 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-27 01:47:36 +0000 |
| commit | 8c6ecc6ea22b74c0fae6375efcbf680ad9e6977a (patch) | |
| tree | 9c7fda430db110281fc93af5cf3b1d2e4a22da7f /uhttpd-cgi.c | |
| parent | 8bd776dcd165ec1b1d21811e642cf6b2b8483567 (diff) | |
| download | uhttpd-8c6ecc6ea22b74c0fae6375efcbf680ad9e6977a.tar.gz | |
[package] uhttpd: clear script timeout as soon as data is received from the child
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@20501 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'uhttpd-cgi.c')
| -rw-r--r-- | uhttpd-cgi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/uhttpd-cgi.c b/uhttpd-cgi.c index 4a30f2f..8bd2250 100644 --- a/uhttpd-cgi.c +++ b/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) ) { |