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

- Eric Wong introduced curlx_nonblock() that the curl tool now (re-)uses for

Browse Source 
setting a file descriptor non-blocking. Used by the functionality Eric
  himself brough on June 15th.
This commit is contained in:
Daniel Stenberg
2009-07-09 21:47:24 +00:00
parent 444bb03fab
commit d709cb2ae3
9 changed files with 24 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/socks.c
View File

@@ -144,7 +144,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name,
return CURLE_OPERATION_TIMEDOUT;
}
Curl_nonblock(sock, FALSE);
curlx_nonblock(sock, FALSE);
/*
* Compose socks4 request
@@ -344,7 +344,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name,
}
}
Curl_nonblock(sock, TRUE);
curlx_nonblock(sock, TRUE);
return CURLE_OK; /* Proxy was successful! */
}
@@ -406,7 +406,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
return CURLE_OPERATION_TIMEDOUT;
}
Curl_nonblock(sock, TRUE);
curlx_nonblock(sock, TRUE);
/* wait until socket gets connected */
result = Curl_socket_ready(CURL_SOCKET_BAD, sock, (int)timeout);
@@ -437,7 +437,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
socksreq[3] = 2; /* username/password */
#endif
Curl_nonblock(sock, FALSE);
curlx_nonblock(sock, FALSE);
code = Curl_write_plain(conn, sock, (char *)socksreq, (2 + (int)socksreq[1]),
&written);
@@ -446,7 +446,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
return CURLE_COULDNT_CONNECT;
}
Curl_nonblock(sock, TRUE);
curlx_nonblock(sock, TRUE);
result = Curl_socket_ready(sock, CURL_SOCKET_BAD, (int)timeout);
@@ -464,7 +464,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
return CURLE_RECV_ERROR;
}
Curl_nonblock(sock, FALSE);
curlx_nonblock(sock, FALSE);
result=Curl_blockread_all(conn, sock, (char *)socksreq, 2, &actualread,
timeout);
@@ -719,7 +719,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
}
#endif
Curl_nonblock(sock, TRUE);
curlx_nonblock(sock, TRUE);
return CURLE_OK; /* Proxy was successful! */
}