From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 21 Nov 2011 22:36:21 +0000 (+0100)
Subject: protocol_connect: show verbose connect and set connect time
X-Git-Tag: curl-7_24_0~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7248439fece7d0f32cc3d52c253b3960a66ad2b3;p=thirdparty%2Fcurl.git

protocol_connect: show verbose connect and set connect time

Regression: commit b998d95b (shipped first in release 7.22.0) made the
condition always equal false that should reset the TIMER_CONNECT timer
and call the Curl_verboseconnect() function.

Reported by: "Captain Basil"
Bug: http://curl.haxx.se/mail/archive-2011-11/0035.html
---

diff --git a/lib/url.c b/lib/url.c
index f478e38280..517dc18da2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3345,11 +3345,8 @@ CURLcode Curl_protocol_connect(struct connectdata *conn,
     return CURLE_OK;
   }
 
-  if(!conn->bits.tcpconnect[FIRSTSOCKET]) {
-
-    Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
-    Curl_verboseconnect(conn);
-  }
+  Curl_pgrsTime(data, TIMER_CONNECT); /* connect done */
+  Curl_verboseconnect(conn);
 
   if(!conn->bits.protoconnstart) {
     if(conn->handler->connect_it) {