From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 18 Aug 2011 22:16:01 +0000 (+0200)
Subject: connect: set TIMER_CONNECT
X-Git-Tag: curl-7_22_0~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3af9ba166cfd456c943d2dbf92a1d4b4b893949c;p=thirdparty%2Fcurl.git

connect: set TIMER_CONNECT

When connecting, make sure TIMER_CONNECT is set.
---

diff --git a/lib/connect.c b/lib/connect.c
index 230d1055ad..7f7e167945 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -700,7 +700,8 @@ CURLcode Curl_is_connected(struct connectdata *conn,
 
       conn->bits.tcpconnect[sockindex] = TRUE;
       *connected = TRUE;
-      Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
+      if(sockindex == FIRSTSOCKET)
+        Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
       Curl_verboseconnect(conn);
       Curl_updateconninfo(conn, sockfd);
 
diff --git a/lib/url.c b/lib/url.c
index 6d0b2aff83..ded03ddd8a 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3202,8 +3202,10 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
 
     if(*connected) {
       result = Curl_connected_proxy(conn);
-      if(!result)
+      if(!result) {
         conn->bits.tcpconnect[FIRSTSOCKET] = TRUE;
+        Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
+      }
     }
   }