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:52:27 UTC
svn commit: r946474 - in /couchdb/trunk: 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:52:26 2010
New Revision: 946474
URL: http://svn.apache.org/viewvc?rev=946474&view=rev
Log:
Renaming `jsonp = false` ini option to `allow_jsonp = false` to be
more clear about its intention.
Modified:
couchdb/trunk/etc/couchdb/default.ini.tpl.in
couchdb/trunk/share/www/script/test/changes.js
couchdb/trunk/share/www/script/test/jsonp.js
couchdb/trunk/src/couchdb/couch_httpd.erl
Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=946474&r1=946473&r2=946474&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Wed May 19 22:52:26 2010
@@ -20,7 +20,7 @@ authentication_handlers = {couch_httpd_o
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
Modified: couchdb/trunk/share/www/script/test/changes.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/changes.js?rev=946474&r1=946473&r2=946474&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/test/changes.js (original)
+++ couchdb/trunk/share/www/script/test/changes.js Wed May 19 22:52:26 2010
@@ -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");
Modified: couchdb/trunk/share/www/script/test/jsonp.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/jsonp.js?rev=946474&r1=946473&r2=946474&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/test/jsonp.js (original)
+++ couchdb/trunk/share/www/script/test/jsonp.js Wed May 19 22:52:26 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/trunk/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=946474&r1=946473&r2=946474&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Wed May 19 22:52:26 2010
@@ -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 ++ "(";