KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uhttpd: add explicit stdin eof notification for Lua and CGI childs

Browse source 
SVN-Revision: 32027
This commit is contained in:
Jo-Philipp Wich 2012-06-02 14:56:24 +00:00
parent 2b4ef2eafa
commit 2cf72776d8
3 changed files with 10 additions and 2 deletions
Show stats 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
PKG_NAME:=uhttpd
PKG_RELEASE:=34
PKG_RELEASE:=35
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \

4
package/uhttpd/src/uhttpd-cgi.c
View file

@ -181,6 +181,10 @@ static bool uh_cgi_socket_cb(struct client *cl)
/* ... write to CGI process */
len = uh_raw_send(state->wfd, buf, len,
cl->server->conf->script_timeout);
/* explicit EOF notification for the child */
if (state->content_length <= 0)
close(state->wfd);
}
/* try to read data from child */

6
package/uhttpd/src/uhttpd-lua.c
View file

@ -298,9 +298,13 @@ static bool uh_lua_socket_cb(struct client *cl)
else
state->content_length = 0;
/* ... write to CGI process */
/* ... write to Lua process */
len = uh_raw_send(state->wfd, buf, len,
cl->server->conf->script_timeout);
/* explicit EOF notification for the child */
if (state->content_length <= 0)
close(state->wfd);
}
/* try to read data from child */