From 83b5c1c4e1be85a3df441c1e1adddb7beef316ac Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Wed, 19 May 2010 22:52:26 +0000
Subject: 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
---
 etc/couchdb/default.ini.tpl.in   | 2 +-
 share/www/script/test/changes.js | 2 +-
 share/www/script/test/jsonp.js   | 2 +-
 src/couchdb/couch_httpd.erl      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index a04dca3d..5cdaf365 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -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
diff --git a/share/www/script/test/changes.js b/share/www/script/test/changes.js
index 6a8802b9..e109a074 100644
--- a/share/www/script/test/changes.js
+++ b/share/www/script/test/changes.js
@@ -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");
diff --git a/share/www/script/test/jsonp.js b/share/www/script/test/jsonp.js
index 02349c93..6bec63ab 100644
--- a/share/www/script/test/jsonp.js
+++ b/share/www/script/test/jsonp.js
@@ -42,7 +42,7 @@ couchTests.jsonp = function(debug) {
 
   run_on_modified_server(
     [{section: "httpd",
-      key: "jsonp",
+      key: "allow_jsonp",
       value: "true"}],
   function() {
 
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 ++ "(";
-- 
cgit v1.2.3