about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-12-12T10·48+0100
committerGitHub <noreply@github.com>2017-12-12T10·48+0100
commit1ca8e9517808198080579a1105d3cf5b4e7ec64c (patch)
tree78aa24096f8c18497d939e2486385b4df426ef75 /src
parentde38fa9987fcd1c2b79c826d49bd235dbd241676 (diff)
parentd76c4fe77080a924dd870e5c5a370a4e4a30d0d4 (diff)
Merge pull request #1722 from bhipple/fix-for-older-libcurl
Fix for builds with system libcurl < 7.30
Diffstat (limited to 'src')
-rw-r--r--src/libstore/download.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index da31029b4f87..4474dfd4b968 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -369,11 +369,13 @@ struct CurlDownloader : public Downloader
 
         curlm = curl_multi_init();
 
-        #if LIBCURL_VERSION_NUM >= 0x072b00 // correct?
+        #if LIBCURL_VERSION_NUM >= 0x072b00 // Multiplex requires >= 7.43.0
         curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
         #endif
+        #if LIBCURL_VERSION_NUM >= 0x071e00 // Max connections requires >= 7.30.0
         curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS,
             settings.binaryCachesParallelConnections.get());
+        #endif
 
         enableHttp2 = settings.enableHttp2;