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

winhttp: Store send and receive timeouts in request_t, and only set them in a netconn_t if it's connected.

Browse Source
This commit is contained in:
Juan Lang 2009-07-21 13:52:22 -07:00 committed by Alexandre Julliard
parent 19e4cfd003
commit 64d69b55f9
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/winhttp/session.c
View File

@ -33,6 +33,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(winhttp); WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
#define DEFAULT_SEND_TIMEOUT 30000
#define DEFAULT_RECEIVE_TIMEOUT 30000
void set_last_error( DWORD error ) void set_last_error( DWORD error )
{ {
/* FIXME */ /* FIXME */
@ -633,6 +636,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o
list_add_head( &connect->hdr.children, &request->hdr.entry ); list_add_head( &connect->hdr.children, &request->hdr.entry );
if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end;
request->send_timeout = DEFAULT_SEND_TIMEOUT;
request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT;
if (!verb || !verb[0]) verb = getW; if (!verb || !verb[0]) verb = getW;
if (!(request->verb = strdupW( verb ))) goto end; if (!(request->verb = strdupW( verb ))) goto end;
@ -1178,10 +1183,16 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int
} }
if (send < 0) send = 0; if (send < 0) send = 0;
if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; request->send_timeout = send;
if (receive < 0) receive = 0; if (receive < 0) receive = 0;
request->recv_timeout = receive;
if (netconn_connected( &request->netconn ))
{
if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE;
if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE;
}
release_object( &request->hdr ); release_object( &request->hdr );
return ret; return ret;

2
dlls/winhttp/winhttp_private.h
View File

@ -139,6 +139,8 @@ typedef struct
LPWSTR version; LPWSTR version;
LPWSTR raw_headers; LPWSTR raw_headers;
netconn_t netconn; netconn_t netconn;
int send_timeout;
int recv_timeout;
LPWSTR status_text; LPWSTR status_text;
DWORD content_length; /* total number of bytes to be read (per chunk) */ DWORD content_length; /* total number of bytes to be read (per chunk) */
DWORD content_read; /* bytes read so far */ DWORD content_read; /* bytes read so far */