jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix small HTTP processing issues

Browse source 
Parse "Transfer-Encoding: chunked" properly.
Get more data if read buffer is empty when starting to process the body.
This commit is contained in:
Jouni Malinen 2009-04-15 11:18:09 +03:00 committed by Jouni Malinen
parent 9fff9fdcf9
commit 814aaa844a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/wps/httpread.c
View file

@ -206,7 +206,8 @@ static int httpread_hdr_option_analyze(
h->got_content_length = 1; h->got_content_length = 1;
return 0; return 0;
} }
if (word_eq(hbp, "TRANSFER_ENCODING:")) { if (word_eq(hbp, "TRANSFER_ENCODING:") ||
word_eq(hbp, "TRANSFER-ENCODING:")) {
while (isgraph(*hbp)) while (isgraph(*hbp))
hbp++; hbp++;
while (*hbp == ' ' || *hbp == '\t') while (*hbp == ' ' || *hbp == '\t')
@ -214,7 +215,7 @@ static int httpread_hdr_option_analyze(
/* There should (?) be no encodings of interest /* There should (?) be no encodings of interest
* other than chunked... * other than chunked...
*/ */
if (os_strncmp(hbp, "CHUNKED", 7)) { if (word_eq(hbp, "CHUNKED")) {
h->chunked = 1; h->chunked = 1;
h->in_chunk_data = 0; h->in_chunk_data = 0;
/* ignore possible ;<parameters> */ /* ignore possible ;<parameters> */
@ -513,6 +514,8 @@ static void httpread_read_handler(int sd, void *eloop_ctx, void *sock_ctx)
* consists of chunks each with a header, ending with * consists of chunks each with a header, ending with
* an ending header. * an ending header.
*/ */
if (nread == 0)
goto get_more;
if (!h->got_body) { if (!h->got_body) {
/* Here to get (more of) body */ /* Here to get (more of) body */
/* ensure we have enough room for worst case for body /* ensure we have enough room for worst case for body