Commit 2145b637 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

wininet: Get rid of the clear parameter to HTTP_GetResponseHeaders.

parent 669a1b35
...@@ -207,7 +207,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = ...@@ -207,7 +207,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
}; };
static CRITICAL_SECTION authcache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION authcache_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
static BOOL HTTP_GetResponseHeaders(http_request_t *req, BOOL clear); static BOOL HTTP_GetResponseHeaders(http_request_t *req);
static DWORD HTTP_ProcessHeader(http_request_t *req, LPCWSTR field, LPCWSTR value, DWORD dwModifier); static DWORD HTTP_ProcessHeader(http_request_t *req, LPCWSTR field, LPCWSTR value, DWORD dwModifier);
static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer); static LPWSTR * HTTP_InterpretHttpHeader(LPCWSTR buffer);
static DWORD HTTP_InsertCustomHeader(http_request_t *req, LPHTTPHEADERW lpHdr); static DWORD HTTP_InsertCustomHeader(http_request_t *req, LPHTTPHEADERW lpHdr);
...@@ -4076,7 +4076,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) ...@@ -4076,7 +4076,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request)
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
return res; return res;
responseLen = HTTP_GetResponseHeaders( request, TRUE ); responseLen = HTTP_GetResponseHeaders( request );
if (!responseLen) if (!responseLen)
return ERROR_HTTP_INVALID_HEADER; return ERROR_HTTP_INVALID_HEADER;
...@@ -4873,7 +4873,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, ...@@ -4873,7 +4873,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext,
INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
responseLen = HTTP_GetResponseHeaders(request, TRUE); responseLen = HTTP_GetResponseHeaders(request);
/* FIXME: We should know that connection is closed before sending /* FIXME: We should know that connection is closed before sending
* headers. Otherwise wrong callbacks are executed */ * headers. Otherwise wrong callbacks are executed */
if(!responseLen && reusing_connection) { if(!responseLen && reusing_connection) {
...@@ -5067,7 +5067,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ ...@@ -5067,7 +5067,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_
INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_SendCallback(&request->hdr, request->hdr.dwContext,
INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);
responseLen = HTTP_GetResponseHeaders(request, TRUE); responseLen = HTTP_GetResponseHeaders(request);
if (!responseLen) if (!responseLen)
res = ERROR_HTTP_HEADER_NOT_FOUND; res = ERROR_HTTP_HEADER_NOT_FOUND;
...@@ -5722,7 +5722,7 @@ static void HTTP_clear_response_headers( http_request_t *request ) ...@@ -5722,7 +5722,7 @@ static void HTTP_clear_response_headers( http_request_t *request )
* TRUE on success * TRUE on success
* FALSE on error * FALSE on error
*/ */
static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) static INT HTTP_GetResponseHeaders(http_request_t *request)
{ {
INT cbreaks = 0; INT cbreaks = 0;
WCHAR buffer[MAX_REPLY_LEN]; WCHAR buffer[MAX_REPLY_LEN];
...@@ -5742,6 +5742,9 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) ...@@ -5742,6 +5742,9 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
if(!request->netconn) if(!request->netconn)
goto lend; goto lend;
/* clear old response headers (eg. from a redirect response) */
HTTP_clear_response_headers( request );
NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout );
do { do {
/* /*
...@@ -5751,12 +5754,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) ...@@ -5751,12 +5754,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
if (!read_line(request, bufferA, &buflen)) if (!read_line(request, bufferA, &buflen))
goto lend; goto lend;
/* clear old response headers (eg. from a redirect response) */
if (clear) {
HTTP_clear_response_headers( request );
clear = FALSE;
}
rc += buflen; rc += buflen;
MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN );
/* check is this a status code line? */ /* check is this a status code line? */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment