summaryrefslogtreecommitdiff
path: root/lib/multi.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-04-28 09:39:33 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-04-28 10:06:49 +0200
commit4a42e5cdaa344755c6bf5317908849619f61798b (patch)
treee7e1e5a713be3510a778a3c7217cd63552044158 /lib/multi.c
parent53ef3493bfd4ddaf71adea051ea530b87abfd5a9 (diff)
downloadcurl-4a42e5cdaa344755c6bf5317908849619f61798b.tar.gz
multi-socks: fix connect to proxy
When connecting to a socks or similar proxy we do the proxy handshake at once when we know the TCP connect is completed and we only consider the "connection" complete after the proxy handshake. This fixes test 564 which is now no longer considered disabled. Reported by: Dmitri Shubin Bug: http://curl.haxx.se/mail/lib-2011-04/0127.html
Diffstat (limited to 'lib/multi.c')
-rw-r--r--lib/multi.c2
1 files changed, 0 insertions, 2 deletions
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