uhttpd: fix a signal related race condition exposed by LuCI on fast machines
SVN-Revision: 20573
This commit is contained in:
parent
9701e09587
commit
b95360d5bc
3 changed files with 7 additions and 3 deletions
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=uhttpd
|
||||
PKG_RELEASE:=5
|
||||
PKG_RELEASE:=6
|
||||
|
||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue