Permalink
Browse files

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
  • Loading branch information...
1 parent 78685de commit 83b5c1c4e1be85a3df441c1e1adddb7beef316ac @janl janl committed May 19, 2010
@@ -20,7 +20,7 @@ authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {co
default_handler = {couch_httpd_db, handle_request}
secure_rewrites = true
vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
-jsonp = false
+allow_jsonp = false
[log]
file = %localstatelogdir%/couch.log
@@ -42,7 +42,7 @@ couchTests.changes = function(debug) {
run_on_modified_server(
[{section: "httpd",
- key: "jsonp",
+ key: "allow_jsonp",
value: "true"}],
function() {
var xhr = CouchDB.request("GET", "/test_suite_db/_changes?callback=jsonp");
@@ -42,7 +42,7 @@ couchTests.jsonp = function(debug) {
run_on_modified_server(
[{section: "httpd",
- key: "jsonp",
+ key: "allow_jsonp",
value: "true"}],
function() {
@@ -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 ++ "(";

0 comments on commit 83b5c1c

Please sign in to comment.