You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/09/14 09:49:20 UTC
[couchdb] 01/05: remove config: [httpd] default_handler
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch feat/conf
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 8bfe5fb20b485e686d3bee7df781eb67778b38eb
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Thu Sep 13 14:52:54 2018 +0200
remove config: [httpd] default_handler
---
rel/overlay/etc/default.ini | 1 -
src/couch/src/couch_httpd.erl | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index dc2e51c..d2303f3 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -132,7 +132,6 @@ database_prefix = userdb-
port = {{backend_port}}
bind_address = 127.0.0.1
authentication_handlers = {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
-default_handler = {couch_httpd_db, handle_request}
secure_rewrites = true
vhost_global_handlers = _utils, _uuids, _session, _users
allow_jsonp = false
diff --git a/src/couch/src/couch_httpd.erl b/src/couch/src/couch_httpd.erl
index a8cfca6..01d05c3 100644
--- a/src/couch/src/couch_httpd.erl
+++ b/src/couch/src/couch_httpd.erl
@@ -99,10 +99,7 @@ start_link(Name, Options) ->
Else -> Else
end,
ok = validate_bind_address(BindAddress),
- DefaultSpec = "{couch_httpd_db, handle_request}",
- DefaultFun = make_arity_1_fun(
- config:get("httpd", "default_handler", DefaultSpec)
- ),
+ DefaultFun = make_arity_1_fun("{couch_httpd_db, handle_request}"),
UrlHandlersList = lists:map(
fun({UrlKey, SpecStr}) ->