diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index ef0645a98..1e8ae5d8b 100644 --- a/src/duckdb/src/function/table/version/pragma_version.cpp +++ b/src/duckdb/src/function/table/version/pragma_version.cpp @@ -1,5 +1,5 @@ #ifndef DUCKDB_PATCH_VERSION -#define DUCKDB_PATCH_VERSION "4-dev14" +#define DUCKDB_PATCH_VERSION "4-dev17" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 4 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.4.4-dev14" +#define DUCKDB_VERSION "v1.4.4-dev17" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "200198b3e0" +#define DUCKDB_SOURCE_ID "1c03ec0812" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/include/duckdb/common/http_util.hpp b/src/duckdb/src/include/duckdb/common/http_util.hpp index 11fc26c48..a493647b3 100644 --- a/src/duckdb/src/include/duckdb/common/http_util.hpp +++ b/src/duckdb/src/include/duckdb/common/http_util.hpp @@ -139,7 +139,7 @@ struct BaseRequest { const string &url; string path; string proto_host_port; - const HTTPHeaders &headers; + HTTPHeaders headers; HTTPParams ¶ms; //! Whether or not to return failed requests (instead of throwing) bool try_request = false; @@ -157,6 +157,14 @@ struct BaseRequest { const TARGET &Cast() const { return reinterpret_cast(*this); } + + static HTTPHeaders MergeHeaders(const HTTPHeaders &headers, HTTPParams ¶ms) { + HTTPHeaders result = headers; + for (const auto &header : params.extra_headers) { + result.Insert(header.first, header.second); + } + return result; + } }; struct GetRequestInfo : public BaseRequest { diff --git a/src/duckdb/src/main/http/http_util.cpp b/src/duckdb/src/main/http/http_util.cpp index fb5a9491f..f562dd8cc 100644 --- a/src/duckdb/src/main/http/http_util.cpp +++ b/src/duckdb/src/main/http/http_util.cpp @@ -123,7 +123,7 @@ unique_ptr HTTPUtil::Request(BaseRequest &request, unique_ptr