aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2009-05-11 11:45:56 +0000
committerDaniel Stenberg <daniel@haxx.se>2009-05-11 11:45:56 +0000
commitf04720afb8e0fd1a5065fb5aa833dbc5e6417698 (patch)
tree91c2b2cdf59cf74bda3a31a574a68707e90ad4aa /lib
parente6e6c6e635b72502a1bfc24cd407a82f9ecd82e2 (diff)
fix the Curl_connected_proxy function for when libcurl actually connects fine
to it in the actual connect call and not asynchronously.
Diffstat (limited to 'lib')
-rw-r--r--lib/url.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/url.c b/lib/url.c
index 402a49151..1395998d0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2825,6 +2825,12 @@ CURLcode Curl_connected_proxy(struct connectdata *conn)
CURLcode result = CURLE_OK;
struct SessionHandle *data = conn->data;
+ if(conn->bits.tcpconnect)
+ /* allow this to get called again from the multi interface when TCP is
+ found connected in the state machine, even though it has already been
+ called if the connection happened "instantly" */
+ return CURLE_OK;
+
switch(data->set.proxytype) {
#ifndef CURL_DISABLE_PROXY
case CURLPROXY_SOCKS5: