Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A5C7117CAE for ; Mon, 29 Jun 2015 21:46:13 +0000 (UTC) Received: (qmail 15034 invoked by uid 500); 29 Jun 2015 21:46:09 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 14823 invoked by uid 500); 29 Jun 2015 21:46:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 13490 invoked by uid 99); 29 Jun 2015 21:46:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2015 21:46:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60F5AE360D; Mon, 29 Jun 2015 21:46:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Mon, 29 Jun 2015 21:46:56 -0000 Message-Id: In-Reply-To: <41909276fb954bfdb4649bc815a971dd@git.apache.org> References: <41909276fb954bfdb4649bc815a971dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Jun 26 23:51:10 2015 +0200 Committer: Robert Kowalski 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)]];