mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-10 01:25:21 +00:00
fix no proxy hosts for remote and list resolvers
This commit is contained in:
parent
946a5913b1
commit
001ac9f847
@ -55,7 +55,7 @@ struct ProxyConfiguration
|
||||
uint16_t port = 0;
|
||||
bool tunneling = false;
|
||||
Protocol original_request_protocol = Protocol::HTTP;
|
||||
std::string no_proxy_hosts = "";
|
||||
std::string no_proxy_hosts = std::string{};
|
||||
|
||||
bool isEmpty() const { return host.empty(); }
|
||||
};
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include <Common/ProxyConfigurationResolverProvider.h>
|
||||
|
||||
#include <Common/EnvironmentProxyConfigurationResolver.h>
|
||||
#include <Common/proxyConfigurationToPocoProxyConfig.h>
|
||||
#include <Common/Exception.h>
|
||||
#include <Common/ProxyListConfigurationResolver.h>
|
||||
#include <Common/RemoteProxyConfigurationResolver.h>
|
||||
@ -54,7 +55,7 @@ namespace
|
||||
return std::make_shared<RemoteProxyConfigurationResolver>(
|
||||
server_configuration,
|
||||
request_protocol,
|
||||
getNoProxyHosts(configuration),
|
||||
buildPocoNonProxyHosts(getNoProxyHosts(configuration)),
|
||||
std::make_shared<RemoteProxyHostFetcherImpl>(),
|
||||
isTunnelingDisabledForHTTPSRequestsOverHTTPProxy(configuration));
|
||||
}
|
||||
@ -97,7 +98,7 @@ namespace
|
||||
: std::make_shared<ProxyListConfigurationResolver>(
|
||||
uris,
|
||||
request_protocol,
|
||||
getNoProxyHosts(configuration),
|
||||
buildPocoNonProxyHosts(getNoProxyHosts(configuration)),
|
||||
isTunnelingDisabledForHTTPSRequestsOverHTTPProxy(configuration));
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
#include <Common/ProxyListConfigurationResolver.h>
|
||||
|
||||
#include <Common/StringUtils.h>
|
||||
#include <Common/logger_useful.h>
|
||||
#include <Poco/URI.h>
|
||||
|
||||
namespace DB
|
||||
|
Loading…
Reference in New Issue
Block a user