Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@86723c9 (#428)
Browse files Browse the repository at this point in the history
fix: remove http prefix from proxy value when present (duckdb/duckdb#13973)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and krlmlr authored Sep 27, 2024
1 parent 60d040c commit 1dfd04d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion src/duckdb/src/common/http_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
namespace duckdb {

void HTTPUtil::ParseHTTPProxyHost(string &proxy_value, string &hostname_out, idx_t &port_out, idx_t default_port) {
auto proxy_split = StringUtil::Split(proxy_value, ":");
auto sanitized_proxy_value = proxy_value;
if (StringUtil::StartsWith(proxy_value, "http://")) {
sanitized_proxy_value = proxy_value.substr(7);
}
auto proxy_split = StringUtil::Split(sanitized_proxy_value, ":");
if (proxy_split.size() == 1) {
hostname_out = proxy_split[0];
port_out = default_port;
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "1-dev173"
#define DUCKDB_PATCH_VERSION "1-dev176"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 1
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.1.1-dev173"
#define DUCKDB_VERSION "v1.1.1-dev176"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "66d8ed93f6"
#define DUCKDB_SOURCE_ID "86723c9912"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit 1dfd04d

Please sign in to comment.