diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-09 13:15:34 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-06-09 13:15:34 +0200 |
| commit | 189bb640d2443a5fcaade2ce169429c629ba3148 (patch) | |
| tree | 1046a11805ae78557e9947569f91c2f8fa853f88 /methods | |
| parent | ba74b79fb5c74d916f9bfe1b314e8107a9e7eab4 (diff) | |
| parent | 308b793694774eece8765d172b8e989d8ed29925 (diff) | |
| download | apt-189bb640d2443a5fcaade2ce169429c629ba3148.tar.gz | |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/ftp.cc | 3 | ||||
| -rw-r--r-- | methods/http.cc | 2 | ||||
| -rw-r--r-- | methods/rsh.cc | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index 3e1725823..97248f900 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -661,8 +661,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time) return true; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // FTPConn::CreateDataFd - Get a data connection /*{{{*/ diff --git a/methods/http.cc b/methods/http.cc index 3e2227f2b..9fa74bffa 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -631,7 +631,7 @@ bool ServerState::HeaderLine(string Line) if (stringcasecmp(Tag,"Last-Modified:") == 0) { - if (StrToTime(Val,Date) == false) + if (RFC1123StrToTime(Val.c_str(), Date) == false) return _error->Error(_("Unknown date format")); return true; } diff --git a/methods/rsh.cc b/methods/rsh.cc index f0ccfc42d..97b4ef151 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -278,8 +278,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time) return false; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // RSHConn::Get - Get a file /*{{{*/ |