summaryrefslogtreecommitdiff
path: root/methods/ftp.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-08-15 14:14:35 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-08-15 14:14:35 +0200
commitbb3e64527b0c1ccf3f31a5a56c21819e25f128ae (patch)
tree0a68ed928e65b502596fcbe22dbce96a62183741 /methods/ftp.cc
parent11bf622600cd1a1eaeda3af64f4757fffa558ae7 (diff)
parentd4882aa1e1a37b3092950180036676a930a5792f (diff)
merged from the debian-sid branch
Diffstat (limited to 'methods/ftp.cc')
-rw-r--r--methods/ftp.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 97248f900..eb7fedd85 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -69,7 +69,8 @@ time_t FtpMethod::FailTime = 0;
// ---------------------------------------------------------------------
/* */
FTPConn::FTPConn(URI Srv) : Len(0), ServerFd(-1), DataFd(-1),
- DataListenFd(-1), ServerName(Srv)
+ DataListenFd(-1), ServerName(Srv),
+ ForceExtended(false), TryPassive(true)
{
Debug = _config->FindB("Debug::Acquire::Ftp",false);
PasvAddr = 0;
@@ -559,7 +560,7 @@ bool FTPConn::ExtGoPasv()
string::const_iterator List[4];
unsigned Count = 0;
Pos++;
- for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); I++)
+ for (string::const_iterator I = Msg.begin() + Pos; I < Msg.end(); ++I)
{
if (*I != Msg[Pos])
continue;