aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-04-29 18:03:30 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-04-29 18:03:30 +0000
commit2f9cabc30b6a880470ce17b6338e71a8986667a4 (patch)
tree957842aae76372a0fbf544eb2a15b45135c48fd4
parent63593f559707b10dc459ed8d7fef13301d12df56 (diff)
Peter Kovacs provided a patch that makes the CURLINFO_CONNECT_TIME work fine
when using the multi interface (too).
-rw-r--r--lib/multi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c
index c15c2026a..78763b27f 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -38,6 +38,7 @@
#include "transfer.h"
#include "url.h"
#include "connect.h"
+#include "progress.h"
/* The last #include file should be: */
#ifdef MALLOCDEBUG
@@ -328,6 +329,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
}
/* Connect. We get a connection identifier filled in. */
+ Curl_pgrsTime(easy->easy_handle, TIMER_STARTSINGLE);
easy->result = Curl_connect(easy->easy_handle, &easy->easy_conn);
/* after the connect has been sent off, go WAITCONNECT */
@@ -468,11 +470,12 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
}
if(CURLM_STATE_COMPLETED != easy->state) {
- if(CURLE_OK != easy->result)
+ if(CURLE_OK != easy->result) {
/*
* If an error was returned, and we aren't in completed state now,
* then we go to completed and consider this transfer aborted. */
easy->state = CURLM_STATE_COMPLETED;
+ }
else
/* this one still lives! */
(*running_handles)++;