summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-05-19 22:52:26 +0000
committerJan Lehnardt <jan@apache.org>2010-05-19 22:52:26 +0000
commit83b5c1c4e1be85a3df441c1e1adddb7beef316ac (patch)
tree2e221c77755bb3511e3fd63906a0b300099c78e0 /src/couchdb
parent78685de6d952e2e123de224663b818931becb454 (diff)
Renaming `jsonp = false` ini option to `allow_jsonp = false` to be
more clear about its intention. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@946474 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_httpd.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index aa434a36..0e5cedf8 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -594,7 +594,7 @@ start_jsonp(Req) ->
CallBack ->
try
% make sure jsonp is configured on (default off)
- case couch_config:get("httpd", "jsonp", "false") of
+ case couch_config:get("httpd", "allow_jsonp", "false") of
"true" ->
validate_callback(CallBack),
CallBack ++ "(";