Merge pull request #3478 from edolstra/ignore-failed-data

Downloader: Only write data to the sink on a 200 response

1 files changed, 9 insertions, 2 deletions

diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index af69699a8..bc875f653 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -83,8 +83,15 @@ struct CurlDownloader : public Downloader
             , callback(std::move(callback))
             , finalSink([this](const unsigned char * data, size_t len) {
                 if (this->request.dataCallback) {
-                    writtenToSink += len;
-                    this->request.dataCallback((char *) data, len);
+                    long httpStatus = 0;
+                    curl_easy_getinfo(req, CURLINFO_RESPONSE_CODE, &httpStatus);
+
+                    /* Only write data to the sink if this is a
+                       successful response. */
+                    if (httpStatus == 0 || httpStatus == 200 || httpStatus == 201 || httpStatus == 206) {
+                        writtenToSink += len;
+                        this->request.dataCallback((char *) data, len);
+                    }
                 } else
                     this->result.data->append((char *) data, len);
               })