From 4e04cbafe7db326b52ee650a4f4ccc3444da6890 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 13 Sep 2021 00:54:38 +0200 Subject: Use https config on https proxies for http servers The settings used for unwrapping TLS connections depend on the access and hostname we connect to more than what we eventually unwrap. The bugreport mentions CaInfo, but all other https-settings should also apply (regardless of generic or hostname specific) to an https proxy, even if the connection we proxy through it is http-only. Closes: #990555 --- methods/connect.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'methods/connect.h') diff --git a/methods/connect.h b/methods/connect.h index bd6507761..413484aa3 100644 --- a/methods/connect.h +++ b/methods/connect.h @@ -42,7 +42,8 @@ ResultState Connect(std::string To, int Port, const char *Service, int DefPort, std::unique_ptr &Fd, unsigned long TimeOut, aptMethod *Owner); ResultState UnwrapSocks(std::string To, int Port, URI Proxy, std::unique_ptr &Fd, unsigned long Timeout, aptMethod *Owner); -ResultState UnwrapTLS(std::string const &To, std::unique_ptr &Fd, unsigned long Timeout, aptMethod *Owner); +ResultState UnwrapTLS(std::string const &To, std::unique_ptr &Fd, unsigned long Timeout, aptMethod *Owner, + aptConfigWrapperForMethods const * OwnerConf); void RotateDNS(); -- cgit v1.2.3-70-g09d2