[package] firewall: make ESTABLISHED,RELATED rules match before INVALID, use conntrac...

[openwrt.git] / package / uhttpd / src / uhttpd-lua.c

diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index ab09841..c2efe33 100644 (file)
--- 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;
 
 
                        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 )
                        {
                        /* 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);
 
                                FD_SET(rfd[0], &reader);
                                FD_SET(wfd[1], &writer);
 

-                               timeout.tv_sec = 15;
-                               timeout.tv_usec = 0;
-

                                /* wait until we can read or write or both */
                                /* 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) )
                                        {
                                        /* ready to write to Lua child */
                                        if( FD_ISSET(wfd[1], &writer) )
                                        {


@@ -512,11 +514,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
                                {
                                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;
                                }
 
                                        break;
                                }


@@ -527,7 +533,10 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
                        close(wfd[1]);
 
                        if( !kill(child, 0) )
                        close(wfd[1]);
 
                        if( !kill(child, 0) )

+                       {

                                kill(child, SIGTERM);
                                kill(child, SIGTERM);

+                               waitpid(child, NULL, 0);
+                       }

 
                        break;
        }
 
                        break;
        }


@@ -537,5 +546,3 @@ void uh_lua_close(lua_State *L)
 {
        lua_close(L);
 }
 {
        lua_close(L);
 }

-
-