aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/connect.c8
-rw-r--r--lib/multi.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/connect.c b/lib/connect.c
index 2cd8cd39c..732fc6721 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -698,7 +698,13 @@ CURLcode Curl_is_connected(struct connectdata *conn,
if(WAITCONN_CONNECTED == rc) {
if(verifyconnect(sockfd, &error)) {
- /* we are connected, awesome! */
+ /* we are connected with TCP, awesome! */
+
+ /* see if we need to do any proxy magic first once we connected */
+ code = Curl_connected_proxy(conn);
+ if(code)
+ return code;
+
conn->bits.tcpconnect = TRUE;
*connected = TRUE;
Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
diff --git a/lib/multi.c b/lib/multi.c
index 9b707abc4..aee190cea 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1141,8 +1141,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
FIRSTSOCKET,
&connected);
if(connected) {
- /* see if we need to do any proxy magic first once we connected */
- easy->result = Curl_connected_proxy(easy->easy_conn);
if(!easy->result)
/* if everything is still fine we do the protocol-specific connect