Skip to content
Snippets Groups Projects
Commit 2f9cabc3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Peter Kovacs provided a patch that makes the CURLINFO_CONNECT_TIME work fine

 when using the multi interface (too).
parent 63593f55
No related branches found
No related tags found
No related merge requests found
......@@ -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)++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment