aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-08-19 00:16:01 +0200
committerDaniel Stenberg <daniel@haxx.se>2011-08-19 00:16:01 +0200
commit3af9ba166cfd456c943d2dbf92a1d4b4b893949c (patch)
tree8c48324d5ccaa95b41858530805147d52da2b1c0
parent7b054a42aa7c1a87bda7abc804eb62d71271f290 (diff)
connect: set TIMER_CONNECT
When connecting, make sure TIMER_CONNECT is set.
-rw-r--r--lib/connect.c3
-rw-r--r--lib/url.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/connect.c b/lib/connect.c
index 230d1055a..7f7e16794 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 6d0b2aff8..ded03ddd8 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 */
+ }
}
}