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
This commit is contained in:
Daniel Stenberg
2011-04-28 09:39:33 +02:00
parent 53ef3493bf
commit 4a42e5cdaa
4 changed files with 9 additions and 9 deletions

View File

@@ -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