From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 29 Mar 2010 09:26:02 +0000 (+0000)
Subject: uhttpd: fix a signal related race condition exposed by LuCI on fast machines
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b95360d5bc9e5463157d91656aaac22180c24f1a;p=openwrt%2Fstaging%2Fzorun.git

uhttpd: fix a signal related race condition exposed by LuCI on fast machines

SVN-Revision: 20573
---

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 4bee17d234..180e2284c3 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 28686b47e2..1a6c6ad4fe 100644
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -562,7 +562,10 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
 			close(wfd[1]);
 
 			if( !kill(child, 0) )
+			{
 				kill(child, SIGTERM);
+				waitpid(child, NULL, 0);
+			}
 
 			break;
 	}
diff --git a/package/uhttpd/src/uhttpd-lua.c b/package/uhttpd/src/uhttpd-lua.c
index b3f3cb498f..c2efe33849 100644
--- a/package/uhttpd/src/uhttpd-lua.c
+++ b/package/uhttpd/src/uhttpd-lua.c
@@ -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) )
+			{
 				kill(child, SIGTERM);
+				waitpid(child, NULL, 0);
+			}
 
 			break;
 	}
@@ -543,5 +546,3 @@ void uh_lua_close(lua_State *L)
 {
 	lua_close(L);
 }
-
-