From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 29 Apr 2003 18:03:30 +0000 (+0000)
Subject:  Peter Kovacs provided a patch that makes the CURLINFO_CONNECT_TIME work fine
X-Git-Tag: curl-7_10_5~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f9cabc30b6a880470ce17b6338e71a8986667a4;p=curl

 Peter Kovacs provided a patch that makes the CURLINFO_CONNECT_TIME work fine
 when using the multi interface (too).
---

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)++;