lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #4470 from matthewbauer/fix-4469

Browse source 
Handle missing etag in 304 Not Modified response
This commit is contained in:
Eelco Dolstra 2021-01-25 12:50:13 +01:00 committed by GitHub
parent 680d8a5b86 1ea5f0b66c
commit c5b42c5a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libfetchers/tarball.cc
View file

@ -64,7 +64,6 @@ DownloadFileResult downloadFile(
if (res.cached) { if (res.cached) {
assert(cached); assert(cached);
assert(request.expectedETag == res.etag);
storePath = std::move(cached->storePath); storePath = std::move(cached->storePath);
} else { } else {
StringSink sink; StringSink sink;

7
src/libstore/filetransfer.cc
View file

@ -375,6 +375,13 @@ struct curlFileTransfer : public FileTransfer
else if (code == CURLE_OK && successfulStatuses.count(httpStatus)) else if (code == CURLE_OK && successfulStatuses.count(httpStatus))
{ {
result.cached = httpStatus == 304; result.cached = httpStatus == 304;
// In 2021, GitHub responds to If-None-Match with 304,
// but omits ETag. We just use the If-None-Match etag
// since 304 implies they are the same.
if (httpStatus == 304 && result.etag == "")
result.etag = request.expectedETag;
act.progress(result.bodySize, result.bodySize); act.progress(result.bodySize, result.bodySize);
done = true; done = true;
callback(std::move(result)); callback(std::move(result));