[package] uhttpd: finish inherited uloop in forked childs, fixes misdispatched events...
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 18 Jun 2012 00:41:43 +0000 (00:41 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 18 Jun 2012 00:41:43 +0000 (00:41 +0000)
SVN-Revision: 32419

package/uhttpd/Makefile
package/uhttpd/src/uhttpd-cgi.c
package/uhttpd/src/uhttpd-lua.c

index 9d8f9fa..b8afa0d 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=35
+PKG_RELEASE:=36
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
index ee1b80c..8336a1b 100644 (file)
@@ -365,6 +365,9 @@ bool uh_cgi_request(struct client *cl, struct path_info *pi,
                sleep(atoi(getenv("UHTTPD_SLEEP_ON_FORK") ?: "0"));
 #endif
 
+               /* do not leak parent epoll descriptor */
+               uloop_done();
+
                /* close loose pipe ends */
                close(rfd[0]);
                close(wfd[1]);
index 0b91b34..5158534 100644 (file)
@@ -397,6 +397,9 @@ bool uh_lua_request(struct client *cl, lua_State *L)
                sleep(atoi(getenv("UHTTPD_SLEEP_ON_FORK") ?: "0"));
 #endif
 
+               /* do not leak parent epoll descriptor */
+               uloop_done();
+
                /* close loose pipe ends */
                close(rfd[0]);
                close(wfd[1]);