qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:33:08 +02:00
Code

[package] uhttpd: retry parsing the CGI header until the buffer space is exhausted

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32662 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-07-11 09:59:05 +00:00
parent 52d62d0be8
commit 696a47b2fb
4 changed files with 23 additions and 11 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:=38
PKG_RELEASE:=39
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \

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

@ -133,7 +133,7 @@ static void uh_cgi_shutdown(struct uh_cgi_state *state)
static bool uh_cgi_socket_cb(struct client *cl)
{
int i, len, hdroff;
int i, len, blen, hdroff;
char buf[UH_LIMIT_MSGHEAD];
struct uh_cgi_state *state = (struct uh_cgi_state *)cl->priv;
@ -184,15 +184,20 @@ static bool uh_cgi_socket_cb(struct client *cl)
}
/* try to read data from child */
while ((len = uh_raw_recv(cl->rpipe.fd, buf, sizeof(buf), -1)) > 0)
while ((len = uh_raw_recv(cl->rpipe.fd, buf, state->header_sent
? sizeof(buf) : state->httpbuf.len, -1)) > 0)
{
/* we have not pushed out headers yet, parse input */
if (!state->header_sent)
{
/* try to parse header ... */
memcpy(state->httpbuf, buf, len);
memcpy(state->httpbuf.ptr, buf, len);
state->httpbuf.len -= len;
state->httpbuf.ptr += len;
if (uh_cgi_header_parse(res, state->httpbuf, len, &hdroff))
blen = state->httpbuf.ptr - state->httpbuf.buf;
if (uh_cgi_header_parse(res, state->httpbuf.buf, blen, &hdroff))
{
/* write status */
ensure_out(uh_http_sendf(cl, NULL,
@ -229,18 +234,19 @@ static bool uh_cgi_socket_cb(struct client *cl)
state->header_sent = true;
/* push out remaining head buffer */
if (hdroff < len)
if (hdroff < blen)
{
D("CGI: Child(%d) relaying %d rest bytes\n",
cl->proc.pid, len - hdroff);
cl->proc.pid, blen - hdroff);
ensure_out(uh_http_send(cl, req,
&buf[hdroff], len - hdroff));
state->httpbuf.buf + hdroff,
blen - hdroff));
}
}
/* ... failed and head buffer exceeded */
else
else if (!state->httpbuf.len)
{
/* I would do this ...
*
@ -536,6 +542,9 @@ bool uh_cgi_request(struct client *cl, struct path_info *pi,
D("CGI: Child(%d) created: rfd(%d) wfd(%d)\n", child, rfd[0], wfd[1]);
state->httpbuf.ptr = state->httpbuf.buf;
state->httpbuf.len = sizeof(state->httpbuf.buf);
state->content_length = cl->httpbuf.len;
/* find content length */

6
package/uhttpd/src/uhttpd-cgi.h
View File

@ -28,7 +28,11 @@
struct uh_cgi_state {
char httpbuf[UH_LIMIT_MSGHEAD];
struct {
char buf[UH_LIMIT_MSGHEAD];
char *ptr;
int len;
} httpbuf;
int content_length;
bool header_sent;
};

1
package/uhttpd/src/uhttpd-lua.h
View File

@ -33,7 +33,6 @@
struct uh_lua_state {
char httpbuf[UH_LIMIT_MSGHEAD];
int content_length;
bool data_sent;
};