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 87E3F11451 for ; Sun, 11 May 2014 19:28:48 +0000 (UTC) Received: (qmail 92147 invoked by uid 500); 11 May 2014 18:28:47 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 91905 invoked by uid 500); 11 May 2014 18:28:47 -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 91803 invoked by uid 99); 11 May 2014 18:28:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 May 2014 18:28:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BA71F81CA16; Sun, 11 May 2014 18:28:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klaus_trainer@apache.org To: commits@couchdb.apache.org Message-Id: <623d59fa4b8941fb811e1cae4d931673@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couchdb commit: updated refs/heads/master to 85df088 Date: Sun, 11 May 2014 18:28:46 +0000 (UTC) Repository: couchdb Updated Branches: refs/heads/master 9bdbea82a -> 85df08859 Use `os:timestamp/0 instead of `erlang:now/0` We don't need the guarantees of `erlang:now/0` in `make_cookie_time/0`, so `os:timestamp/0` is just fine. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/85df0885 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/85df0885 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/85df0885 Branch: refs/heads/master Commit: 85df08859e731797df1f60d41ea3a322b735926e Parents: 9bdbea8 Author: Klaus Trainer Authored: Fri Mar 7 00:17:08 2014 +0100 Committer: Klaus Trainer Committed: Sun May 11 20:15:55 2014 +0200 ---------------------------------------------------------------------- src/couchdb/couch_httpd_auth.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/85df0885/src/couchdb/couch_httpd_auth.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl index 6888f06..faf8789 100644 --- a/src/couchdb/couch_httpd_auth.erl +++ b/src/couchdb/couch_httpd_auth.erl @@ -395,7 +395,7 @@ auth_name(String) when is_list(String) -> ?l2b(Name). make_cookie_time() -> - {NowMS, NowS, _} = erlang:now(), + {NowMS, NowS, _} = os:timestamp(), NowMS * 1000000 + NowS. cookie_scheme(#httpd{mochi_req=MochiReq}) ->