nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-02-22 11:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4374 from NixOS/2.3-absolute-url-in-binary-caches

Browse Source 
Allow HTTP binary cache to request absolute uris
This commit is contained in:
Eelco Dolstra 2020-12-16 14:42:25 +01:00 committed by GitHub
commit 8803753666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstore/http-binary-cache-store.cc
View File

@ -82,7 +82,7 @@ protected:
checkEnabled();
try {
DownloadRequest request(cacheUri + "/" + path);
DownloadRequest request(makeRequest(path));
request.head = true;
getDownloader()->download(request);
return true;
@ -100,7 +100,7 @@ protected:
const std::string & data,
const std::string & mimeType) override
{
auto req = DownloadRequest(cacheUri + "/" + path);
auto req = makeRequest(path);
req.data = std::make_shared<string>(data); // FIXME: inefficient
req.mimeType = mimeType;
try {
@ -112,8 +112,10 @@ protected:
DownloadRequest makeRequest(const std::string & path)
{
DownloadRequest request(cacheUri + "/" + path);
return request;
return DownloadRequest(
hasPrefix(path, "https://") || hasPrefix(path, "http://") || hasPrefix(path, "file://")
? path
: cacheUri + "/" + path);
}
void getFile(const std::string & path, Sink & sink) override