domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 20573
This commit is contained in:
Jo-Philipp Wich
2010-03-29 09:26:02 +00:00
parent 9701e09587
commit b95360d5bc
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/uhttpd/Makefile
View File

@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

3
package/uhttpd/src/uhttpd-cgi.c
View File

@@ -562,7 +562,10 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
close(wfd[1]); close(wfd[1]);
if( !kill(child, 0) ) if( !kill(child, 0) )
{
kill(child, SIGTERM); kill(child, SIGTERM);
waitpid(child, NULL, 0);
}
break; break;
} }

5
package/uhttpd/src/uhttpd-lua.c
View File

@@ -533,7 +533,10 @@ void uh_lua_request(struct client *cl, struct http_request *req, lua_State *L)
close(wfd[1]); close(wfd[1]);
if( !kill(child, 0) ) 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);
} }