Updated Branches: refs/heads/master 491d48d6c -> c66ac4a80
Rename proxy_authentification_handler to proxy_authentication_handler All our other handlers follow the *_authentication_handler form and various bits of documentation imply they all do. The old form will continue to work, though it's marked as deprecated, and will be removed in a future release. Thanks to Stepan Stolyarov <[email protected]> for the original patch. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c66ac4a8 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c66ac4a8 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c66ac4a8 Branch: refs/heads/master Commit: c66ac4a80e3440caec37990359832c43ab971d84 Parents: 491d48d Author: Robert Newson <[email protected]> Authored: Thu Nov 7 11:32:10 2013 +0000 Committer: Robert Newson <[email protected]> Committed: Thu Nov 7 11:32:10 2013 +0000 ---------------------------------------------------------------------- src/couchdb/couch_httpd_auth.erl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/c66ac4a8/src/couchdb/couch_httpd_auth.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl index a967e09..b8c4e26 100644 --- a/src/couchdb/couch_httpd_auth.erl +++ b/src/couchdb/couch_httpd_auth.erl @@ -16,7 +16,7 @@ -export([default_authentication_handler/1,special_test_authentication_handler/1]). -export([cookie_authentication_handler/1]). -export([null_authentication_handler/1]). --export([proxy_authentification_handler/1]). +-export([proxy_authentication_handler/1, proxy_authentification_handler/1]). -export([cookie_auth_header/2]). -export([handle_session_req/1]). @@ -111,11 +111,15 @@ null_authentication_handler(Req) -> % ecret key is the secret key in couch_httpd_auth section of ini. This token is optional % if value of proxy_use_secret key in couch_httpd_auth section of ini isn't true. % -proxy_authentification_handler(Req) -> +proxy_authentication_handler(Req) -> case proxy_auth_user(Req) of nil -> Req; Req2 -> Req2 end. + +%% @deprecated +proxy_authentification_handler(Req) -> + proxy_authentication_handler(Req). proxy_auth_user(Req) -> XHeaderUserName = couch_config:get("couch_httpd_auth", "x_auth_username",
