summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2013-11-07 11:32:10 +0000
committerRobert Newson <rnewson@apache.org>2013-11-07 11:32:10 +0000
commitc66ac4a80e3440caec37990359832c43ab971d84 (patch)
tree1e1e7cc2990df66d315de242135177115776ad4d
parent491d48d6c3e2b6a723579271b0a515230f838dd1 (diff)
downloadcouchdb-c66ac4a80e3440caec37990359832c43ab971d84.tar.gz
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 <stepan.stolyarov@gmail.com> for the original patch.
-rw-r--r--src/couchdb/couch_httpd_auth.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl
index a967e091f..b8c4e2602 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",