diff options
| author | Julian Andres Klode <jak@debian.org> | 2021-10-18 13:37:09 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2021-10-18 13:37:09 +0000 |
| commit | 76bd0ab589f5a577bd6127bf6487fd351de5b32a (patch) | |
| tree | a1d191fcb07118428a09e92bd29827e3af622bf6 /methods/connect.h | |
| parent | f6b08c78dcdda1734710a5ef01553f53ceb5c52e (diff) | |
| parent | 4e04cbafe7db326b52ee650a4f4ccc3444da6890 (diff) | |
Merge branch 'fix/file-https-proxy' into 'main'
Fix file:/// vs file:/ hang & https-proxy for http
See merge request apt-team/apt!187
Diffstat (limited to 'methods/connect.h')
| -rw-r--r-- | methods/connect.h | 3 |
1 files changed, 2 insertions, 1 deletions
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<MethodFd> &Fd, unsigned long TimeOut, aptMethod *Owner); ResultState UnwrapSocks(std::string To, int Port, URI Proxy, std::unique_ptr<MethodFd> &Fd, unsigned long Timeout, aptMethod *Owner); -ResultState UnwrapTLS(std::string const &To, std::unique_ptr<MethodFd> &Fd, unsigned long Timeout, aptMethod *Owner); +ResultState UnwrapTLS(std::string const &To, std::unique_ptr<MethodFd> &Fd, unsigned long Timeout, aptMethod *Owner, + aptConfigWrapperForMethods const * OwnerConf); void RotateDNS(); |