kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

CURL_AT_LEAST_VERSION -> LIBCURL_VERSION_NUM

Browse source 
http://hydra.nixos.org/build/42025230
This commit is contained in:
Eelco Dolstra 2016-10-14 14:44:15 +02:00
parent 5e61b422c5
commit 2f9d60ed7f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/download.cc
View file

@ -15,7 +15,6 @@
#include <cmath> #include <cmath>
#include <random> #include <random>
namespace nix { namespace nix {
double getTime() double getTime()
@ -188,10 +187,10 @@ struct CurlDownloader : public Downloader
curl_easy_setopt(req, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(req, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(req, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(req, CURLOPT_USERAGENT, ("Nix/" + nixVersion).c_str()); curl_easy_setopt(req, CURLOPT_USERAGENT, ("Nix/" + nixVersion).c_str());
#if CURL_AT_LEAST_VERSION(7, 43, 0) #if LIBCURL_VERSION_NUM >= 0x072b00
curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1); curl_easy_setopt(req, CURLOPT_PIPEWAIT, 1);
#endif #endif
#if CURL_AT_LEAST_VERSION(7, 47, 0) #if LIBCURL_VERSION_NUM >= 0x072f00
if (downloader.enableHttp2) if (downloader.enableHttp2)
curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); curl_easy_setopt(req, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
#endif #endif
@ -303,7 +302,7 @@ struct CurlDownloader : public Downloader
curlm = curl_multi_init(); curlm = curl_multi_init();
#if CURL_AT_LEAST_VERSION(7, 43, 0) // correct? #if LIBCURL_VERSION_NUM >= 0x072b00 // correct?
curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); curl_multi_setopt(curlm, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
#endif #endif
curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS, curl_multi_setopt(curlm, CURLMOPT_MAX_TOTAL_CONNECTIONS,