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

winhttp: Use connection's timeout rather than default timeout when reading a line.

This commit is contained in:
Juan Lang 2009-07-21 13:53:11 -07:00 committed by Alexandre Julliard
parent 80100334f1
commit 2418e82810
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/winhttp/net.c
View File

@ -519,9 +519,16 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
pfd.events = POLLIN;
while (recvd < *buflen)
{
if (poll( &pfd, 1, DEFAULT_RECEIVE_TIMEOUT * 1000 ) > 0)
int timeout, res;
struct timeval tv;
socklen_t len = sizeof(tv);
if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1))
timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
else
timeout = -1;
if (poll( &pfd, 1, timeout ) > 0)
{
int res;
if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0)
{
if (res == -1) set_last_error( sock_get_error( errno ) );