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 2010/05/20 00:51:19 UTC
svn commit: r946473 - in /couchdb/branches/0.11.x:
etc/couchdb/default.ini.tpl.in share/www/script/test/changes.js
share/www/script/test/jsonp.js src/couchdb/couch_httpd.erl
Author: jan
Date: Wed May 19 22:51:18 2010
New Revision: 946473
URL: http://svn.apache.org/viewvc?rev=946473&view=rev
Log:
Renaming `jsonp = false` ini option to `allow_jsonp = false` to be
more clear about its intention.
Modified:
couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in
couchdb/branches/0.11.x/share/www/script/test/changes.js
couchdb/branches/0.11.x/share/www/script/test/jsonp.js
couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl
Modified: couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in?rev=946473&r1=946472&r2=946473&view=diff
==============================================================================
--- couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in Wed May 19 22:51:18 2010
@@ -18,7 +18,7 @@ bind_address = 127.0.0.1
authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
default_handler = {couch_httpd_db, handle_request}
secure_rewrites = true
-jsonp = false
+allow_jsonp = false
[log]
file = %localstatelogdir%/couch.log
Modified: couchdb/branches/0.11.x/share/www/script/test/changes.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/test/changes.js?rev=946473&r1=946472&r2=946473&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/test/changes.js (original)
+++ couchdb/branches/0.11.x/share/www/script/test/changes.js Wed May 19 22:51:18 2010
@@ -40,7 +40,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");
Modified: couchdb/branches/0.11.x/share/www/script/test/jsonp.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/test/jsonp.js?rev=946473&r1=946472&r2=946473&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/test/jsonp.js (original)
+++ couchdb/branches/0.11.x/share/www/script/test/jsonp.js Wed May 19 22:51:18 2010
@@ -42,7 +42,7 @@ couchTests.jsonp = function(debug) {
run_on_modified_server(
[{section: "httpd",
- key: "jsonp",
+ key: "allow_jsonp",
value: "true"}],
function() {
Modified: couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl?rev=946473&r1=946472&r2=946473&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_httpd.erl Wed May 19 22:51:18 2010
@@ -574,7 +574,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 ++ "(";