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 9991710A10 for ; Thu, 6 Feb 2014 17:32:36 +0000 (UTC) Received: (qmail 35815 invoked by uid 500); 6 Feb 2014 17:32:31 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 35349 invoked by uid 500); 6 Feb 2014 17:32:19 -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 34951 invoked by uid 99); 6 Feb 2014 17:32:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 17:32:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6E2F68A35A0; Thu, 6 Feb 2014 17:32:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Thu, 06 Feb 2014 17:32:15 -0000 Message-Id: <30aadd8c4d81450c86b2ea90ba82a351@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/12] couch-httpd commit: updated refs/heads/import-rcouch to 5b12577 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/40cde824 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/40cde824 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/40cde824 Branch: refs/heads/import-rcouch Commit: 40cde824013ef67a25573b1fa76540fdda056292 Parents: 5e6def1 Author: benoitc Authored: Mon Jan 13 09:01:59 2014 +0100 Committer: Paul J. Davis Committed: Thu Feb 6 11:31:04 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/40cde824/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