Browse Source

Reword error for timed out read/write on SOCKS proxy

Closes: #898886
tags/debian/1.7.0_alpha1
David Kalnischkies 3 years ago
parent
commit
dd23021f58
1 changed files with 6 additions and 1 deletions
  1. +6
    -1
      methods/connect.cc

+ 6
- 1
methods/connect.cc View File

@@ -546,7 +546,12 @@ static bool TalkToSocksProxy(int const ServerFd, std::string const &Proxy,
unsigned int const Size, unsigned int const Timeout)
{
if (WaitFd(ServerFd, ReadWrite, Timeout) == false)
return _error->Error("Waiting for the SOCKS proxy %s to %s timed out", URI::SiteOnly(Proxy).c_str(), type);
{
if (ReadWrite)
return _error->Error("Timed out while waiting to write '%s' to proxy %s", type, URI::SiteOnly(Proxy).c_str());
else
return _error->Error("Timed out while waiting to read '%s' from proxy %s", type, URI::SiteOnly(Proxy).c_str());
}
if (ReadWrite == false)
{
if (FileFd::Read(ServerFd, ToFrom, Size) == false)


Loading…
Cancel
Save