[02/50] couchdb commit: updated refs/heads/1.6.x to eeb31cb

[dc...@apache.org]

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/1.6.x
Commit: 85df08859e731797df1f60d41ea3a322b735926e
Parents: 9bdbea8
Author: Klaus Trainer <kl...@apache.org>
Authored: Fri Mar 7 00:17:08 2014 +0100
Committer: Klaus Trainer <kl...@apache.org>
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}) ->