You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/10/27 20:39:48 UTC

[1/2] chttpd commit: updated refs/heads/master to 06880c3

Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master 038a933a0 -> 06880c35d


Use couch_epi:decide/5 for authenticate/authorize


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

Branch: refs/heads/master
Commit: a6c3bb8b4fa80d0d21ac6cf6c4e1e04aa917e0b4
Parents: 7683100
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Oct 9 13:51:24 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Fri Oct 9 13:51:24 2015 -0700

----------------------------------------------------------------------
 src/chttpd_auth.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a6c3bb8b/src/chttpd_auth.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_auth.erl b/src/chttpd_auth.erl
index 0746138..be12148 100644
--- a/src/chttpd_auth.erl
+++ b/src/chttpd_auth.erl
@@ -70,11 +70,11 @@ handle_session_req(Req) ->
 
 maybe_handle(Func, Args, Default) ->
     Handle = couch_epi:get_handle(?SERVICE_ID),
-    case couch_epi:apply(Handle, ?SERVICE_ID, Func, Args, []) of
-        [] when is_function(Default) ->
+    case couch_epi:decide(Handle, ?SERVICE_ID, Func, Args, []) of
+        no_decision when is_function(Default) ->
             apply(Default, Args);
-        [] ->
+        no_decision ->
             Default;
-        [Result] ->
+        {decided, Result} ->
             Result
     end.


[2/2] chttpd commit: updated refs/heads/master to 06880c3

Posted by kx...@apache.org.
Merge remote-tracking branch 'github/pr/81'


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

Branch: refs/heads/master
Commit: 06880c35d7812bcfae0861e3f9e08366d550e1cb
Parents: 038a933 a6c3bb8
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 27 22:32:54 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 27 22:32:54 2015 +0300

----------------------------------------------------------------------
 src/chttpd_auth.erl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------