generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops, missed the shut-off non-blocking fix

Browse Source
This commit is contained in:
Daniel Stenberg 2001-04-11 06:59:00 +00:00
parent b2362bf51c
commit 62056a644f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/url.c
View File

@ -1232,7 +1232,7 @@ static CURLcode ConnectPlease(struct UrlData *data,
FD_ZERO (&connectfd); FD_ZERO (&connectfd);
FD_SET(conn->firstsocket, &connectfd); FD_SET(conn->firstsocket, &connectfd);
if (conn->data->connecttimeout > 0) { if (conn->data->connecttimeout > 0) {
nonblock = 1; nonblock = 1;
} }
ioctlsocket(conn->firstsocket, FIONBIO, &nonblock); ioctlsocket(conn->firstsocket, FIONBIO, &nonblock);
#endif #endif
@ -1241,14 +1241,18 @@ static CURLcode ConnectPlease(struct UrlData *data,
sizeof(conn->serv_addr) sizeof(conn->serv_addr)
) < 0) { ) < 0) {
#if defined(WIN32) #if defined(WIN32)
conntimeout.tv_sec = conn->data->connecttimeout; conntimeout.tv_sec = conn->data->connecttimeout;
conntimeout.tv_usec = 0; conntimeout.tv_usec = 0;
if(-1 != select (conn->firstsocket + 1, NULL, &connectfd, NULL, &conntimeout)) { if(-1 != select (conn->firstsocket + 1, NULL, &connectfd, NULL, &conntimeout)) {
if (FD_ISSET(conn->firstsocket, &connectfd)) if (FD_ISSET(conn->firstsocket, &connectfd)) {
return CURLE_OK; /* shut off non-blocking again */
else nonblock = 0;
errno = EINTR; ioctlsocket(conn->firstsocket, FIONBIO, &nonblock);
} return CURLE_OK;
}
else
errno = EINTR;
}
#endif #endif
switch(errno) { switch(errno) {
#ifdef ECONNREFUSED #ifdef ECONNREFUSED