diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-29 09:26:02 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-03-29 09:26:02 +0000 |
| commit | 33f40d767770b339e1a36ae6953fb3162cf43346 (patch) | |
| tree | fbf808afb2e1365824bd7e5436a775bc00fb5534 /package/uhttpd | |
| parent | f5144821ed6cb3ba0333f8fde7184dbead85a9c8 (diff) | |
| download | upstream-33f40d767770b339e1a36ae6953fb3162cf43346.tar.gz upstream-33f40d767770b339e1a36ae6953fb3162cf43346.tar.bz2 upstream-33f40d767770b339e1a36ae6953fb3162cf43346.zip | |
[package] uhttpd: fix a signal related race condition exposed by LuCI on fast machines
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20573 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd')
| -rw-r--r-- | package/uhttpd/Makefile | 2 | ||||
| -rw-r--r-- | package/uhttpd/src/uhttpd-cgi.c | 3 | ||||
| -rw-r--r-- | package/uhttpd/src/uhttpd-lua.c | 5 |
3 files changed, 7 insertions, 3 deletions
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); } - - |