X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/410c95eb98f84c413a839bb2d1d6e9611f3e2d9f..8a437f3f5b7d2cae08e0513cf52650e6b062d401:/package/uhttpd/src/uhttpd-lua.c

diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index c1e749043..c2efe3384 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_intr(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) )
 					{
@@ -531,7 +533,10 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
 			close(wfd[1]);
 
 			if( !kill(child, 0) )
+			{
 				kill(child, SIGTERM);
+				waitpid(child, NULL, 0);
+			}
 
 			break;
 	}
@@ -541,5 +546,3 @@ void uh_lua_close(lua_State *L)
 {
 	lua_close(L);
 }
-
-