FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard usage of CURLMOPT_MAX_TOTAL_CONNECTIONS

Browse Source 
Check the Curl patch version to avoid breaking on older
sustems.
This commit is contained in:
James Turner 2016-05-25 20:08:20 +01:00
parent b3d95c0754
commit 49bd96c55d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/io/HTTPClient.cxx
View File

@ -80,7 +80,9 @@ public:
// see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html // see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html
// we request HTTP 1.1 pipelining // we request HTTP 1.1 pipelining
curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */); curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */);
#if (LIBCURL_VERSION_MINOR >= 30)
curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxConnections); curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxConnections);
#endif
curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH, curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH,
(long) maxPipelineDepth); (long) maxPipelineDepth);
curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS, curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS,
@ -138,7 +140,9 @@ Client::~Client()
void Client::setMaxConnections(unsigned int maxCon) void Client::setMaxConnections(unsigned int maxCon)
{ {
d->maxConnections = maxCon; d->maxConnections = maxCon;
#if (LIBCURL_VERSION_MINOR >= 30)
curl_multi_setopt(d->curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxCon); curl_multi_setopt(d->curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxCon);
#endif
} }
void Client::setMaxHostConnections(unsigned int maxHostCon) void Client::setMaxHostConnections(unsigned int maxHostCon)