You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/01/17 23:53:26 UTC
[49/50] git commit: Fix local to universal handling
Fix local to universal handling
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/ebce0622
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/ebce0622
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/ebce0622
Branch: refs/heads/import
Commit: ebce06223b9e490e1df803a8dd8c5f9e4fcc818e
Parents: e92c786
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 16 14:45:26 2012 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jan 17 14:51:47 2014 -0800
----------------------------------------------------------------------
src/mochiweb_cookies.erl | 2 +-
src/mochiweb_request.erl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/ebce0622/src/mochiweb_cookies.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_cookies.erl b/src/mochiweb_cookies.erl
index 1901d5e..ee91d0c 100644
--- a/src/mochiweb_cookies.erl
+++ b/src/mochiweb_cookies.erl
@@ -51,7 +51,7 @@ cookie(Key, Value, Options) ->
undefined ->
calendar:universal_time();
LocalTime ->
- calendar:local_time_to_universal_time_dst(LocalTime)
+ erlang:localtime_to_universaltime(LocalTime)
end,
Age = case RawAge < 0 of
true ->
http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/ebce0622/src/mochiweb_request.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_request.erl b/src/mochiweb_request.erl
index a114203..980f5ad 100644
--- a/src/mochiweb_request.erl
+++ b/src/mochiweb_request.erl
@@ -641,7 +641,7 @@ read_file_info(File) ->
end.
to_universal(LocalTime) ->
- calendar:local_time_to_universal_time_dst(LocalTime).
+ erlang:localtime_to_universaltime(LocalTime).
server_headers() ->
[{"Server", "MochiWeb/1.0 (" ++ ?QUIP ++ ")"},