[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 fcbdc64..c2efe33 100644 (file)
--- a/package/uhttpd/src/uhttpd-lua.c
+++ b/package/uhttpd/src/uhttpd-lua.c
@@ -452,7 +452,7 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
                                FD_SET(wfd[1], &writer);
 
                                /* wait until we can read or write or both */
                                FD_SET(wfd[1], &writer);
 
                                /* wait until we can read or write or both */

-                               if( select(fd_max, &reader,
+                               if( select_intr(fd_max, &reader,

                                    (content_length > -1) ? &writer : NULL, NULL,
                                        (data_sent < 1) ? &timeout : NULL) > 0
                                ) {
                                    (content_length > -1) ? &writer : NULL, NULL,
                                        (data_sent < 1) ? &timeout : NULL) > 0
                                ) {


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


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

-
-