Fixed Download() not setting header

Author: COM8

cpr/session.cpp

@@ -675,6 +675,10 @@ std::shared_ptr<CurlHolder> Session::Impl::GetCurlHolder() {
 
 Response Session::Impl::makeDownloadRequest() {
     assert(curl_->handle);
+
+    // Set Header:
+    SetHeaderInternal();
+
     const std::string parametersContent = parameters_.GetContent(*curl_);
     if (!parametersContent.empty()) {
         Url new_url{url_ + "?" + parametersContent};

test/CMakeLists.txt

@@ -56,6 +56,7 @@ add_cpr_test(structures)
 add_cpr_test(encoded_auth)
 add_cpr_test(proxy_auth)
 add_cpr_test(version)
+add_cpr_test(download)
 
 if (ENABLE_SSL_TESTS)
     add_cpr_test(ssl)

test/download_tests.cpp

@@ -0,0 +1,36 @@
+#include <cstddef>
+#include <gtest/gtest.h>
+
+#include <string>
+
+#include <cpr/cpr.h>
+
+#include "cpr/api.h"
+#include "cpr/callback.h"
+#include "cpr/cprtypes.h"
+#include "cpr/session.h"
+#include "httpServer.hpp"
+
+
+static cpr::HttpServer* server = new cpr::HttpServer();
+
+bool write_data(std::string /*data*/, intptr_t /*userdata*/) {
+    return true;
+}
+
+TEST(DownloadTests, DownloadGzip) {
+    cpr::Url url{server->GetBaseUrl() + "/download_gzip.html"};
+    cpr::Session session;
+    session.SetHeader(cpr::Header{{"Accept-Encoding", "gzip"}});
+    session.SetUrl(url);
+    cpr::Response response = session.Download(cpr::WriteCallback{write_data, 0});
+    EXPECT_EQ(url, response.url);
+    EXPECT_EQ(200, response.status_code);
+    EXPECT_EQ(cpr::ErrorCode::OK, response.error.code);
+}
+
+int main(int argc, char** argv) {
+    ::testing::InitGoogleTest(&argc, argv);
+    ::testing::AddGlobalTestEnvironment(server);
+    return RUN_ALL_TESTS();
+}

test/httpServer.cpp

@@ -609,6 +609,32 @@ void HttpServer::OnRequestPatchNotAllowed(mg_connection* conn, http_message* msg
     }
 }
 
+void HttpServer::OnRequestDownloadGzip(mg_connection* conn, http_message* msg) {
+    if (std::string{msg->method.p, msg->method.len} == std::string{"DOWNLOAD"}) {
+        mg_http_send_error(conn, 405, "Method Not Allowed");
+    } else {
+        std::string encoding;
+        for (size_t i = 0; i < sizeof(msg->header_names) / sizeof(mg_str); i++) {
+            if (!msg->header_names[i].p) {
+                continue;
+            }
+
+            std::string name = std::string(msg->header_names[i].p, msg->header_names[i].len);
+            if (std::string{"Accept-Encoding"} == name) {
+                encoding = std::string(msg->header_values[i].p, msg->header_values[i].len);
+                break;
+            }
+        }
+        if (encoding.find("gzip") == std::string::npos) {
+            mg_http_send_error(conn, 405, ("Invalid encoding: " + encoding).c_str());
+        } else {
+            std::string response = "Download!";
+            mg_send_head(conn, 200, static_cast<int>(response.length()), "");
+            mg_send(conn, response.c_str(), static_cast<int>(response.length()));
+        }
+    }
+}
+
 void HttpServer::OnRequest(mg_connection* conn, http_message* msg) {
     std::string uri = std::string(msg->uri.p, msg->uri.len);
     if (uri == "/") {
@@ -671,6 +697,8 @@ void HttpServer::OnRequest(mg_connection* conn, http_message* msg) {
         OnRequestPatch(conn, msg);
     } else if (uri == "/patch_unallowed.html") {
         OnRequestPatchNotAllowed(conn, msg);
+    } else if (uri == "/download_gzip.html") {
+        OnRequestDownloadGzip(conn, msg);
     } else {
         OnRequestNotFound(conn, msg);
     }

test/httpServer.hpp

@@ -50,10 +50,10 @@ class HttpServer : public AbstractServer {
     static void OnRequestPutNotAllowed(mg_connection* conn, http_message* msg);
     static void OnRequestPatch(mg_connection* conn, http_message* msg);
     static void OnRequestPatchNotAllowed(mg_connection* conn, http_message* msg);
+    static void OnRequestDownloadGzip(mg_connection* conn, http_message* msg);
 
   protected:
-    mg_connection* initServer(mg_mgr* mgr,
-                              MG_CB(mg_event_handler_t event_handler, void* user_data)) override;
+    mg_connection* initServer(mg_mgr* mgr, MG_CB(mg_event_handler_t event_handler, void* user_data)) override;
 };
 } // namespace cpr