diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-04T12·43+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-04T12·43+0200 |
| commit | 86e8c67efc33cf756500a1dec7fd6313658f2664 (patch) | |
| tree | cc8ebf5b6a1dbe3a8215284d7f4cc34d7454141c | |
| parent | 4bd51d74af34cc0014cd1b2dd0dd105e379e9770 (diff) | |
Fix build with older versions of libcurl
| -rw-r--r-- | src/libstore/download.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc index 22a3f969c7c1..1cb7d4854a98 100644 --- a/src/libstore/download.cc +++ b/src/libstore/download.cc @@ -188,9 +188,13 @@ struct CurlDownloader : public Downloader curl_easy_setopt(req, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(req, CURLOPT_USERAGENT, ("Nix/" + nixVersion).c_str()); + #ifdef CURLOPT_PIPEWAIT curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1); + #endif + #ifdef CURL_HTTP_VERSION_2TLS if (downloader.enableHttp2) curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); + #endif curl_easy_setopt(req, CURLOPT_WRITEFUNCTION, DownloadItem::writeCallbackWrapper); curl_easy_setopt(req, CURLOPT_WRITEDATA, this); curl_easy_setopt(req, CURLOPT_HEADERFUNCTION, DownloadItem::headerCallbackWrapper); @@ -297,7 +301,9 @@ struct CurlDownloader : public Downloader curlm = curl_multi_init(); + #ifdef CURLPIPE_MULTIPLEX curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); + #endif curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, settings.get("binary-caches-parallel-connections", 25)); |