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

diff --git a/lib/connect.c b/lib/connect.c
index 2cd8cd39cc21db69fc9a410436d97899f0d203c5..732fc6721330ff93e6754479c7308f630e9c4380 100644 (file)
--- 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 9b707abc4e9888b9b7dd120fd2703104331220e9..aee190ceaada0a877d06dd85e0e0e22f904fa772 100644 (file)
--- 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

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 9ac123b18294e421786cd880c9a7ec91422927d3..82123e6ae4bbb758886b6f1cacd86140385c76bf 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -2,5 +2,4 @@
 # test cases are run by runtests.pl. Just add the plain test case numbers, one
 # per line.
 # Lines starting with '#' letters are treated as comments.
-564
 811

diff --git a/tests/data/test564 b/tests/data/test564
index 6d0609d9df8993f5bd74c54d2acace91570ffa76..72bf12919ef4f658cd9b296aa71da6415f4ae90d 100644 (file)
--- a/tests/data/test564
+++ b/tests/data/test564
@@ -47,11 +47,8 @@ PWD
 CWD path\r
 EPSV\r
 TYPE I\r
-SIZE 546\r
-RETR 546\r
-EPSV\r
-SIZE 546\r
-RETR 546\r
+SIZE 564\r
+RETR 564\r
 QUIT\r
 </protocol>
 <stdout>