ported 1.4.4 branch changes (needs build checks and test runs!)

This commit is contained in:
Aleksandar Fabijanic
2012-05-19 03:04:51 +00:00
parent e5e3a57baf
commit 9b952a29c7
62 changed files with 1361 additions and 135 deletions

View File

@@ -329,10 +329,13 @@ std::string FTPClientSession::extractPath(const std::string& response)
StreamSocket FTPClientSession::establishDataConnection(const std::string& command, const std::string& arg)
{
StreamSocket ss;
if (_passiveMode)
return passiveDataConnection(command, arg);
ss = passiveDataConnection(command, arg);
else
return activeDataConnection(command, arg);
ss = activeDataConnection(command, arg);
ss.setReceiveTimeout(_timeout);
return ss;
}