Skip to content

Commit 8e3c2df

Browse files
duckdblabs-botgithub-actions[bot]
authored andcommitted
Update vendored DuckDB sources to 1c03ec0812
1 parent dec48c9 commit 8e3c2df

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

src/duckdb/src/function/table/version/pragma_version.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "4-dev14"
2+
#define DUCKDB_PATCH_VERSION "4-dev17"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.4-dev14"
11+
#define DUCKDB_VERSION "v1.4.4-dev17"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "200198b3e0"
14+
#define DUCKDB_SOURCE_ID "1c03ec0812"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/common/http_util.hpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ struct BaseRequest {
139139
const string &url;
140140
string path;
141141
string proto_host_port;
142-
const HTTPHeaders &headers;
142+
HTTPHeaders headers;
143143
HTTPParams &params;
144144
//! Whether or not to return failed requests (instead of throwing)
145145
bool try_request = false;
@@ -157,6 +157,14 @@ struct BaseRequest {
157157
const TARGET &Cast() const {
158158
return reinterpret_cast<const TARGET &>(*this);
159159
}
160+
161+
static HTTPHeaders MergeHeaders(const HTTPHeaders &headers, HTTPParams &params) {
162+
HTTPHeaders result = headers;
163+
for (const auto &header : params.extra_headers) {
164+
result.Insert(header.first, header.second);
165+
}
166+
return result;
167+
}
160168
};
161169

162170
struct GetRequestInfo : public BaseRequest {

src/duckdb/src/main/http/http_util.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ unique_ptr<HTTPResponse> HTTPUtil::Request(BaseRequest &request, unique_ptr<HTTP
123123
}
124124

125125
BaseRequest::BaseRequest(RequestType type, const string &url, const HTTPHeaders &headers, HTTPParams &params)
126-
: type(type), url(url), headers(headers), params(params) {
126+
: type(type), url(url), headers(MergeHeaders(headers, params)), params(params) {
127127
HTTPUtil::DecomposeURL(url, path, proto_host_port);
128128
}
129129

@@ -191,9 +191,6 @@ class HTTPLibClient : public HTTPClient {
191191
for (auto &entry : header_map) {
192192
headers.insert(entry);
193193
}
194-
for (auto &entry : params.extra_headers) {
195-
headers.insert(entry);
196-
}
197194
return headers;
198195
}
199196

0 commit comments

Comments
 (0)