Commit 5f931797 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

winhttp: Set actual default receive response timeout to 21sec.

parent 7f0ca9c2
......@@ -43,6 +43,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
#define DEFAULT_KEEP_ALIVE_TIMEOUT 30000
#define ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT 21000
static int request_receive_response_timeout( struct request *req )
{
if (req->receive_response_timeout == -1) return ACTUAL_DEFAULT_RECEIVE_RESPONSE_TIMEOUT;
return req->receive_response_timeout;
}
static const WCHAR *attribute_table[] =
{
L"Mime-Version", /* WINHTTP_QUERY_MIME_VERSION = 0 */
......@@ -1658,7 +1666,7 @@ static DWORD open_connection( struct request *request )
return ret;
}
netconn_set_timeout( netconn, TRUE, request->send_timeout );
netconn_set_timeout( netconn, FALSE, request->receive_response_timeout );
netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request ));
request->netconn = netconn;
......@@ -1696,7 +1704,7 @@ static DWORD open_connection( struct request *request )
TRACE("using connection %p\n", netconn);
netconn_set_timeout( netconn, TRUE, request->send_timeout );
netconn_set_timeout( netconn, FALSE, request->receive_response_timeout );
netconn_set_timeout( netconn, FALSE, request_receive_response_timeout( request ));
request->netconn = netconn;
}
......@@ -2329,7 +2337,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD
if (!chunked && content_length <= optional_len)
{
netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout );
netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request ));
request->read_reply_status = read_reply( request );
if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED)
request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED;
......@@ -2932,7 +2940,7 @@ static DWORD receive_response( struct request *request )
}
/* fallthrough */
case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT:
netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout );
netconn_set_timeout( request->netconn, FALSE, request_receive_response_timeout( request ));
request->read_reply_status = read_reply( request );
request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED;
break;
......
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