From 3d768c0aca70c53f549c700607a3678db18a0187 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 17 Aug 2011 00:28:09 +0200 Subject: [PATCH] Revert the lib/connect.c and lib/multi.c modifications from 4a42e5cdaa344755c This seems to get test 564 reliably working again. --- lib/connect.c | 8 +------- lib/multi.c | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index 9301f01..3197402 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -691,13 +691,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, if(WAITCONN_CONNECTED == rc) { if(verifyconnect(sockfd, &error)) { - /* 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; - + /* we are connected, awesome! */ conn->bits.tcpconnect = TRUE; *connected = TRUE; Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */ diff --git a/lib/multi.c b/lib/multi.c index aee190c..9b707ab 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1141,6 +1141,8 @@ 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 -- 1.7.6