wininet: Move handling of existing request connections to open_http_connection.
This commit is contained in:
parent
992c2bd3e5
commit
12e6c14e7c
|
@ -4786,9 +4786,22 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing)
|
||||||
netconn_t *netconn = NULL;
|
netconn_t *netconn = NULL;
|
||||||
DWORD res;
|
DWORD res;
|
||||||
|
|
||||||
assert(!request->netconn);
|
|
||||||
reset_data_stream(request);
|
reset_data_stream(request);
|
||||||
|
|
||||||
|
if (request->netconn)
|
||||||
|
{
|
||||||
|
if (NETCON_is_alive(request->netconn))
|
||||||
|
{
|
||||||
|
*reusing = TRUE;
|
||||||
|
return ERROR_SUCCESS;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
free_netconn(request->netconn);
|
||||||
|
request->netconn = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
res = HTTP_ResolveName(request);
|
res = HTTP_ResolveName(request);
|
||||||
if(res != ERROR_SUCCESS)
|
if(res != ERROR_SUCCESS)
|
||||||
return res;
|
return res;
|
||||||
|
@ -4936,20 +4949,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
|
||||||
|
|
||||||
loop_next = FALSE;
|
loop_next = FALSE;
|
||||||
|
|
||||||
if (request->netconn)
|
|
||||||
{
|
|
||||||
if (!NETCON_is_alive(request->netconn))
|
|
||||||
{
|
|
||||||
free_netconn(request->netconn);
|
|
||||||
request->netconn = NULL;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
reset_data_stream(request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
reusing_connection = request->netconn != NULL;
|
|
||||||
|
|
||||||
if(redirected) {
|
if(redirected) {
|
||||||
request->contentLength = ~0u;
|
request->contentLength = ~0u;
|
||||||
request->bytesToWrite = 0;
|
request->bytesToWrite = 0;
|
||||||
|
@ -4984,7 +4983,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
|
||||||
|
|
||||||
TRACE("Request header -> %s\n", debugstr_w(requestString) );
|
TRACE("Request header -> %s\n", debugstr_w(requestString) );
|
||||||
|
|
||||||
if (!reusing_connection && (res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS)
|
res = open_http_connection(request, &reusing_connection);
|
||||||
|
if (res != ERROR_SUCCESS)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* send the request as ASCII, tack on the optional data */
|
/* send the request as ASCII, tack on the optional data */
|
||||||
|
|
Loading…
Reference in New Issue