You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/06/29 23:46:56 UTC

[50/50] couch commit: updated refs/heads/COUCHDB-2734-header-date to f3e022c

use couch_util_clock:rfc1123()


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/f3e022c0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/f3e022c0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/f3e022c0

Branch: refs/heads/COUCHDB-2734-header-date
Commit: f3e022c0aa2b143e5a8c735755b25ef7c3288760
Parents: b09aabe
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Fri Jun 26 23:51:10 2015 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Jun 29 23:38:44 2015 +0200

----------------------------------------------------------------------
 src/mochiweb_cookies.erl | 1 +
 src/mochiweb_request.erl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f3e022c0/src/mochiweb_cookies.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_cookies.erl b/src/mochiweb_cookies.erl
index f678042..158db4d 100644
--- a/src/mochiweb_cookies.erl
+++ b/src/mochiweb_cookies.erl
@@ -118,6 +118,7 @@ quote(V0) ->
 
 add_seconds(Secs, LocalTime) ->
     Greg = calendar:datetime_to_gregorian_seconds(LocalTime),
+    calendar:gregorian_seconds_to_datetime(Greg + Secs).
 
 age_to_cookie_date(Age, LocalTime) ->
     httpd_util:rfc1123_date(add_seconds(Age, LocalTime)).

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f3e022c0/src/mochiweb_request.erl
----------------------------------------------------------------------
diff --git a/src/mochiweb_request.erl b/src/mochiweb_request.erl
index 794e1e9..a4089c2 100644
--- a/src/mochiweb_request.erl
+++ b/src/mochiweb_request.erl
@@ -666,7 +666,7 @@ to_universal(LocalTime) ->
 
 server_headers() ->
     [{"Server", "MochiWeb/1.0 (" ++ ?QUIP ++ ")"},
-     {"Date", httpd_util:rfc1123_date()}].
+     {"Date", couch_util_clock:rfc1123()}].
 
 make_code(X) when is_integer(X) ->
     [integer_to_list(X), [" " | httpd_util:reason_phrase(X)]];