You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/09/25 13:07:10 UTC
[1/2] chttpd commit: updated refs/heads/master to 64a5728
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master 6f14c6169 -> 64a572815
Fix crypto deprecations
COUCHDB-2825
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/65de6ae1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/65de6ae1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/65de6ae1
Branch: refs/heads/master
Commit: 65de6ae1fd32f03e2923f4f6d86c972800da5bce
Parents: 091c5ac
Author: Robert Newson <rn...@apache.org>
Authored: Wed Sep 23 19:29:54 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Sep 23 19:29:54 2015 +0100
----------------------------------------------------------------------
src/chttpd.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/65de6ae1/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 8613578..1bd7e42 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -595,7 +595,7 @@ doc_etag(#doc{revs={Start, [DiskRev|_]}}) ->
"\"" ++ ?b2l(couch_doc:rev_to_str({Start, DiskRev})) ++ "\"".
make_etag(Term) ->
- <<SigInt:128/integer>> = erlang:md5(term_to_binary(Term)),
+ <<SigInt:128/integer>> = couch_crypto:hash(md5, term_to_binary(Term)),
list_to_binary(io_lib:format("\"~.36B\"",[SigInt])).
etag_match(Req, CurrentEtag) when is_binary(CurrentEtag) ->
[2/2] chttpd commit: updated refs/heads/master to 64a5728
Posted by rn...@apache.org.
Merge remote-tracking branch 'cloudant/2825-crypto-deprecations'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/64a57281
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/64a57281
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/64a57281
Branch: refs/heads/master
Commit: 64a5728152ea0a17dd71f133241ef47575fdf98a
Parents: 6f14c61 65de6ae
Author: Robert Newson <rn...@apache.org>
Authored: Fri Sep 25 12:06:45 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Sep 25 12:06:45 2015 +0100
----------------------------------------------------------------------
src/chttpd.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------