Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Unified Diff: net/ftp/ftp_util.cc

Issue 2090713003: Make callers of FromUTC(Local)Exploded in net/ use new time API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make callers of FromUTC(Local)Exploded in net/ use new time API. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/http/http_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_util.cc
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc
index 00b23b7c10b771daea8da81324fbc4fcc9f4249a..956a95679df7821fa9613f40cecfc52685be03a7 100644
--- a/net/ftp/ftp_util.cc
+++ b/net/ftp/ftp_util.cc
@@ -285,8 +285,12 @@ bool FtpUtil::LsDateListingToTime(const base::string16& month,
}
}
- // We don't know the time zone of the listing, so just use local time.
- *result = base::Time::FromLocalExploded(time_exploded);
+ // We don't know the time zone of the listing, so try both.
maksims (do not use this acc) 2016/10/05 12:59:02 So, problem was here - it had been using a bad gue
mmenke 2016/10/05 16:53:38 Why is one succeeding, but the other failing? See
maksims (do not use this acc) 2016/10/06 12:07:07 ExplodedMostlyEquals() doesn't depend on that. The
mmenke 2016/10/06 15:36:54 I'm not comfortable with workarounding around the
+ if (!base::Time::FromLocalExploded(time_exploded, result)) {
+ if (!base::Time::FromUTCExploded(time_exploded, result)) {
+ return false;
+ }
+ }
return true;
}
@@ -348,8 +352,12 @@ bool FtpUtil::WindowsDateListingToTime(const base::string16& date,
}
}
- // We don't know the time zone of the server, so just use local time.
- *result = base::Time::FromLocalExploded(time_exploded);
+ // We don't know the time zone of the server, so try both.
+ if (!base::Time::FromLocalExploded(time_exploded, result)) {
+ if (!base::Time::FromUTCExploded(time_exploded, result)) {
+ return false;
+ }
+ }
return true;
}
« no previous file with comments | « net/ftp/ftp_directory_listing_parser_vms.cc ('k') | net/http/http_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698