Commit 4a42e5cd authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 53ef3493

lib/connect.c

+7 −1
Original line number Diff line number Diff line
@@ -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 */

lib/multi.c

+0 −2
Original line number Diff line number Diff line
@@ -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

tests/data/DISABLED

+0 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test564

+2 −5
Original line number Diff line number Diff line
@@ -47,11 +47,8 @@ PWD 
CWD path

EPSV

TYPE I

SIZE 546

RETR 546

EPSV

SIZE 546

RETR 546

SIZE 564

RETR 564

QUIT

</protocol>

<stdout>