Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-11-09 10:48:04 +01:00
commit f8ad0e4466

View file

@ -2092,7 +2092,10 @@ namespace NLGUI
MultiCurl = curl_multi_init(); MultiCurl = curl_multi_init();
if (MultiCurl) if (MultiCurl)
{ {
#ifdef CURLMOPT_MAX_HOST_CONNECTIONS
// added in libcurl 7.30.0
curl_multi_setopt(MultiCurl, CURLMOPT_MAX_HOST_CONNECTIONS, options.curlMaxConnections); curl_multi_setopt(MultiCurl, CURLMOPT_MAX_HOST_CONNECTIONS, options.curlMaxConnections);
#endif
curl_multi_setopt(MultiCurl, CURLMOPT_PIPELINING, 1); curl_multi_setopt(MultiCurl, CURLMOPT_PIPELINING, 1);
} }
RunningCurls = 0; RunningCurls = 0;