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

wininet: Store status code in http_request_t and use it in set_content_length.

This commit is contained in:
Jacek Caban 2012-05-03 12:19:47 +02:00 committed by Alexandre Julliard
parent ebf406c163
commit 5240e40b69
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/wininet/http.c
View File

@ -2585,13 +2585,13 @@ static const data_stream_vtbl_t chunked_stream_vtbl = {
}; };
/* set the request content length based on the headers */ /* set the request content length based on the headers */
static DWORD set_content_length(http_request_t *request, DWORD status_code) static DWORD set_content_length(http_request_t *request)
{ {
static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0};
WCHAR encoding[20]; WCHAR encoding[20];
DWORD size; DWORD size;
if(status_code == HTTP_STATUS_NO_CONTENT) { if(request->status_code == HTTP_STATUS_NO_CONTENT) {
request->contentLength = request->netconn_stream.content_length = 0; request->contentLength = request->netconn_stream.content_length = 0;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -4826,7 +4826,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
&dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS) &dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS)
dwStatusCode = 0; dwStatusCode = 0;
res = set_content_length(request, dwStatusCode); res = set_content_length(request);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
goto lend; goto lend;
if(!request->contentLength) if(!request->contentLength)
@ -5000,7 +5000,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_
&dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS) &dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS)
dwCode = 0; dwCode = 0;
if ((res = set_content_length( request, dwCode )) == ERROR_SUCCESS) { if ((res = set_content_length(request)) == ERROR_SUCCESS) {
if(!request->contentLength) if(!request->contentLength)
http_release_netconn(request, TRUE); http_release_netconn(request, TRUE);
} }
@ -5692,6 +5692,8 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
goto lend; goto lend;
*status_text++=0; *status_text++=0;
request->status_code = atoiW(status_code);
TRACE("version [%s] status code [%s] status text [%s]\n", TRACE("version [%s] status code [%s] status text [%s]\n",
debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) );

1
dlls/wininet/internet.h
View File

@ -312,6 +312,7 @@ typedef struct
DWORD send_timeout; DWORD send_timeout;
DWORD receive_timeout; DWORD receive_timeout;
LPWSTR version; LPWSTR version;
DWORD status_code;
LPWSTR statusText; LPWSTR statusText;
DWORD bytesToWrite; DWORD bytesToWrite;
DWORD bytesWritten; DWORD bytesWritten;