]> granicus.if.org Git - curl/commitdiff
connect: set TIMER_CONNECT
authorDaniel Stenberg <daniel@haxx.se>
Thu, 18 Aug 2011 22:16:01 +0000 (00:16 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 18 Aug 2011 22:16:01 +0000 (00:16 +0200)
When connecting, make sure TIMER_CONNECT is set.

lib/connect.c
lib/url.c

index 230d1055adc919b996422ab0e1fff18467f9f744..7f7e16794571e4e1221bfa812c4ac6262e542b16 100644 (file)
@@ -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);
 
index 6d0b2aff833a3fb57524e49c0628d3f2c4ae02e1..ded03ddd8ad0ce4e747d0d0ab0b6b6106a47374d 100644 (file)
--- 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 */
+      }
     }
   }