From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jun 2012 00:41:43 +0000 (+0000)
Subject: uhttpd: finish inherited uloop in forked childs, fixes misdispatched events leading... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c73b39fd302245a47813d1a41a082df7b82c45fb;p=openwrt%2Fstaging%2Fjow.git

uhttpd: finish inherited uloop in forked childs, fixes misdispatched events leading to race conditions and bad memory accesses

SVN-Revision: 32419
---

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 9d8f9fa95d..b8afa0d89f 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -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 := \
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index ee1b80cc7f..8336a1b71f 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -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]);
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index 0b91b348f4..5158534e27 100644
--- a/package/uhttpd/src/uhttpd-lua.c
+++ b/package/uhttpd/src/uhttpd-lua.c
@@ -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]);