aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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: