From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 11 May 2009 11:45:56 +0000 (+0000)
Subject: fix the Curl_connected_proxy function for when libcurl actually connects fine
X-Git-Tag: upstream/7.37.1~6248
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f04720afb8e0fd1a5065fb5aa833dbc5e6417698;p=platform%2Fupstream%2Fcurl.git

fix the Curl_connected_proxy function for when libcurl actually connects fine
to it in the actual connect call and not asynchronously.
---

diff --git a/lib/url.c b/lib/url.c
index 402a491..1395998 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: