Jacek Caban : wininet: Store status code in http_request_t and use it in set_content_length.
Alexandre Julliard
julliard at winehq.org
Thu May 3 14:23:49 CDT 2012
Module: wine
Branch: master
Commit: 5240e40b69a28e883961a861ce82d05de59ddf44
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5240e40b69a28e883961a861ce82d05de59ddf44
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu May 3 12:19:47 2012 +0200
wininet: Store status code in http_request_t and use it in set_content_length.
---
dlls/wininet/http.c | 10 ++++++----
dlls/wininet/internet.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 54db118..fae4543 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2585,13 +2585,13 @@ static const data_stream_vtbl_t chunked_stream_vtbl = {
};
/* 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};
WCHAR encoding[20];
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;
return ERROR_SUCCESS;
}
@@ -4826,7 +4826,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
&dwStatusCode,&dwBufferSize,NULL) != ERROR_SUCCESS)
dwStatusCode = 0;
- res = set_content_length(request, dwStatusCode);
+ res = set_content_length(request);
if(res != ERROR_SUCCESS)
goto lend;
if(!request->contentLength)
@@ -5000,7 +5000,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_
&dwCode,&dwCodeLength,NULL) != ERROR_SUCCESS)
dwCode = 0;
- if ((res = set_content_length( request, dwCode )) == ERROR_SUCCESS) {
+ if ((res = set_content_length(request)) == ERROR_SUCCESS) {
if(!request->contentLength)
http_release_netconn(request, TRUE);
}
@@ -5692,6 +5692,8 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
goto lend;
*status_text++=0;
+ request->status_code = atoiW(status_code);
+
TRACE("version [%s] status code [%s] status text [%s]\n",
debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) );
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 6cf1f38..b515a71 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -312,6 +312,7 @@ typedef struct
DWORD send_timeout;
DWORD receive_timeout;
LPWSTR version;
+ DWORD status_code;
LPWSTR statusText;
DWORD bytesToWrite;
DWORD bytesWritten;
More information about the wine-cvs
mailing list