couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [06/14] couch-httpd commit: updated refs/heads/1994-merge-rcouch to d936233
Date Thu, 13 Feb 2014 03:10:02 GMT
export couch_httpd:set_auth_handlers/0

This function wasn't exported so any changes to the
`httpf/authentication_handlers` setting wasn't effective.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/886f562c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/886f562c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/886f562c

Branch: refs/heads/1994-merge-rcouch
Commit: 886f562cfb6f98e7aea080f19a049d1894e1414b
Parents: b97fac7
Author: benoitc <benoitc@apache.org>
Authored: Mon Jan 13 09:01:59 2014 +0100
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Wed Feb 12 21:05:52 2014 -0600

----------------------------------------------------------------------
 src/couch_httpd.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/886f562c/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index ae28817..8cef53f 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -30,7 +30,7 @@
 -export([send_json/2,send_json/3,send_json/4,last_chunk/1,parse_multipart_request/3]).
 -export([accepted_encodings/1,handle_request_int/5,validate_referer/1,validate_ctype/2]).
 -export([http_1_0_keep_alive/2]).
-
+-export([set_auth_handlers/0]).
 
 start_link(couch_http) ->
     Port = couch_config:get("httpd", "port", "5984"),
@@ -157,7 +157,7 @@ set_auth_handlers() ->
         couch_config:get("httpd", "authentication_handlers", "")),
     AuthHandlers = lists:map(
         fun(A) -> {make_arity_1_fun(A), ?l2b(A)} end, AuthenticationSrcs),
-    ok = application:set_env(couch, auth_handlers, AuthHandlers).
+    ok = application:set_env(couch_httpd, auth_handlers, AuthHandlers).
 
 % SpecStr is a string like "{my_module, my_fun}"
 %  or "{my_module, my_fun, <<"my_arg">>}"
@@ -286,7 +286,7 @@ handle_request_int(MochiReq, DefaultFun,
     },
 
     HandlerFun = couch_util:dict_find(HandlerKey, UrlHandlers, DefaultFun),
-    {ok, AuthHandlers} = application:get_env(couch, auth_handlers),
+    {ok, AuthHandlers} = application:get_env(couch_httpd, auth_handlers),
 
     {ok, Resp} =
     try


Mime
View raw message