ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Decompress gzip data in refill_buffer to ensure that we have the data to report.

This commit is contained in:
Jacek Caban 2011-03-17 01:01:19 +01:00 committed by Alexandre Julliard
parent 48aadd44ae
commit 2bb3f4fa75
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/wininet/http.c
View File

@ -2062,7 +2062,7 @@ static BOOL end_of_read_data( http_request_t *req )
} }
/* fetch some more data into the read buffer (the read section must be held) */ /* fetch some more data into the read buffer (the read section must be held) */
static DWORD refill_buffer( http_request_t *req ) static DWORD refill_read_buffer( http_request_t *req )
{ {
int len = sizeof(req->read_buf); int len = sizeof(req->read_buf);
DWORD res; DWORD res;
@ -2092,7 +2092,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync,
while(read < size && !req->gzip_stream->end_of_data) { while(read < size && !req->gzip_stream->end_of_data) {
if(!req->read_size) { if(!req->read_size) {
if(!sync || refill_buffer(req) != ERROR_SUCCESS) if((!sync && read) || (ret = refill_read_buffer(req)) != ERROR_SUCCESS)
break; break;
} }
@ -2126,13 +2126,13 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync,
return ret; return ret;
} }
static void refill_gzip_buffer(http_request_t *req) static DWORD refill_gzip_buffer(http_request_t *req)
{ {
DWORD res; DWORD res;
int len; int len;
if(!req->gzip_stream || !req->read_size || req->gzip_stream->buf_size == sizeof(req->gzip_stream->buf)) if(req->gzip_stream->buf_size == sizeof(req->gzip_stream->buf))
return; return ERROR_SUCCESS;
if(req->gzip_stream->buf_pos) { if(req->gzip_stream->buf_pos) {
if(req->gzip_stream->buf_size) if(req->gzip_stream->buf_size)
@ -2144,15 +2144,20 @@ static void refill_gzip_buffer(http_request_t *req)
sizeof(req->gzip_stream->buf) - req->gzip_stream->buf_size, FALSE, &len); sizeof(req->gzip_stream->buf) - req->gzip_stream->buf_size, FALSE, &len);
if(res == ERROR_SUCCESS) if(res == ERROR_SUCCESS)
req->gzip_stream->buf_size += len; req->gzip_stream->buf_size += len;
return res;
}
static DWORD refill_buffer( http_request_t *req )
{
return req->gzip_stream ? refill_gzip_buffer(req) : refill_read_buffer(req);
} }
/* return the size of data available to be read immediately (the read section must be held) */ /* return the size of data available to be read immediately (the read section must be held) */
static DWORD get_avail_data( http_request_t *req ) static DWORD get_avail_data( http_request_t *req )
{ {
if (req->gzip_stream) { if (req->gzip_stream)
refill_gzip_buffer(req);
return req->gzip_stream->buf_size; return req->gzip_stream->buf_size;
}
if (req->read_chunked && (req->contentLength == ~0u || req->contentLength == req->contentRead)) if (req->read_chunked && (req->contentLength == ~0u || req->contentLength == req->contentRead))
return 0; return 0;
return min( req->read_size, req->contentLength - req->contentRead ); return min( req->read_size, req->contentLength - req->contentRead );