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/02/12 07:22:14 UTC

[42/50] [abbrv] mochiweb commit: updated refs/heads/import-master to 3a54dbf

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/d1efd606
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/d1efd606
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/d1efd606

Branch: refs/heads/import-master
Commit: d1efd606e6dc4f11b622d828295dd492ba660b5a
Parents: fb2c49b
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 16 14:45:26 2012 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 16 14:45:26 2012 +0100

----------------------------------------------------------------------
 mochiweb_cookies.erl | 2 +-
 mochiweb_request.erl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/d1efd606/mochiweb_cookies.erl
----------------------------------------------------------------------
diff --git a/mochiweb_cookies.erl b/mochiweb_cookies.erl
index 1901d5e..ee91d0c 100644
--- a/mochiweb_cookies.erl
+++ b/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/d1efd606/mochiweb_request.erl
----------------------------------------------------------------------
diff --git a/mochiweb_request.erl b/mochiweb_request.erl
index a114203..980f5ad 100644
--- a/mochiweb_request.erl
+++ b/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 ++ ")"},