From 85435f0ce506ad15bfc4d5ce6ab98644d2b05235 Mon Sep 17 00:00:00 2001 From: lotodore Date: Tue, 22 Apr 2008 23:02:25 +0000 Subject: [PATCH] Back to curl multi mode, as things are now working :-). --- src/net/common/downloadhelper.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/net/common/downloadhelper.cpp b/src/net/common/downloadhelper.cpp index 721b3377..56d3dc9d 100644 --- a/src/net/common/downloadhelper.cpp +++ b/src/net/common/downloadhelper.cpp @@ -52,7 +52,7 @@ DownloadHelper::Init(const string &url, const string &targetFileName) { m_data->targetFile = fopen(targetFileName.c_str(), "wb"); m_data->curlHandle = curl_easy_init(); - //m_data->curlMultiHandle = curl_multi_init(); + m_data->curlMultiHandle = curl_multi_init(); // TODO throw exception on error m_data->curlUrl = url; @@ -60,13 +60,13 @@ DownloadHelper::Init(const string &url, const string &targetFileName) curl_easy_setopt(m_data->curlHandle, CURLOPT_WRITEFUNCTION, NULL); curl_easy_setopt(m_data->curlHandle, CURLOPT_WRITEDATA, m_data->targetFile); - //curl_multi_add_handle(m_data->curlMultiHandle, m_data->curlHandle); + curl_multi_add_handle(m_data->curlMultiHandle, m_data->curlHandle); } bool DownloadHelper::Process() { - /*bool retVal = false; + bool retVal = false; int runningHandles = 0; CURLMcode curlResult; do @@ -103,10 +103,7 @@ DownloadHelper::Process() Cleanup(); retVal = true; } - return retVal;*/ - curl_easy_perform(m_data->curlHandle); - Cleanup(); - return true; + return retVal; } void