diff options
| author | jdcormie <jdcormie@google.com> | 2015-11-10 16:41:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-11 00:42:02 +0000 |
| commit | 73a78b014bfec89ed01839c094af5e9037aa9cab (patch) | |
| tree | 802947fc521821551c1ab451f25d8eaf7ec53720 | |
| parent | 007dae3a184d8d99001a1e9023e0214a557a989f (diff) | |
| download | chromium_src-73a78b014bfec89ed01839c094af5e9037aa9cab.zip chromium_src-73a78b014bfec89ed01839c094af5e9037aa9cab.tar.gz chromium_src-73a78b014bfec89ed01839c094af5e9037aa9cab.tar.bz2 | |
Fix EpollServer::NowInUsec() and ::ApproximateNowInUs() to no longer return
UNIX epoch times in the year 2384 due to misuse of Time::ToInternalValue()
Fixes a problem where epoll_quic_client against www.google.com fails with:
"Error: QUIC_CRYPTO_SERVER_CONFIG_EXPIRED"
BUG=None
R=rch@chromium.org
Review URL: https://codereview.chromium.org/1433073002
Cr-Commit-Position: refs/heads/master@{#358982}
| -rw-r--r-- | net/tools/epoll_server/epoll_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tools/epoll_server/epoll_server.cc b/net/tools/epoll_server/epoll_server.cc index aa1c2da..4c1d34b 100644 --- a/net/tools/epoll_server/epoll_server.cc +++ b/net/tools/epoll_server/epoll_server.cc @@ -489,7 +489,7 @@ void EpollServer::Wake() { } int64 EpollServer::NowInUsec() const { - return base::Time::Now().ToInternalValue(); + return (base::Time::Now() - base::Time::UnixEpoch()).InMicroseconds(); } int64 EpollServer::ApproximateNowInUsec() const { |