diff options
| author | Robert Newson <rnewson@apache.org> | 2012-08-16 14:45:26 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2012-08-16 14:45:26 +0100 |
| commit | 317c97f4eb434ec962b004dc2444fc0e8bb01d5b (patch) | |
| tree | 41c384816f99cfe93a2029562cff62234fdc8c7c | |
| parent | 010522ea34dfee0be980df27ce14c44f18802bb1 (diff) | |
| download | couchdb-317c97f4eb434ec962b004dc2444fc0e8bb01d5b.tar.gz | |
Fix local to universal handling
| -rw-r--r-- | src/mochiweb/mochiweb_cookies.erl | 2 | ||||
| -rw-r--r-- | src/mochiweb/mochiweb_request.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mochiweb/mochiweb_cookies.erl b/src/mochiweb/mochiweb_cookies.erl index 1901d5e10..ee91d0c1d 100644 --- a/src/mochiweb/mochiweb_cookies.erl +++ b/src/mochiweb/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 -> diff --git a/src/mochiweb/mochiweb_request.erl b/src/mochiweb/mochiweb_request.erl index a1142036a..980f5ad01 100644 --- a/src/mochiweb/mochiweb_request.erl +++ b/src/mochiweb/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 ++ ")"}, |