summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_httpd_view.erl
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-05-13 03:33:31 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-05-13 03:33:31 +0000
commitdb55453ae3ea2c1952ee6c114c733dc934e25682 (patch)
tree3eea5299ea0c1e6d9f5cc55f38fe7fb1fab9ea2c /src/couchdb/couch_httpd_view.erl
parentc596db1079f5a062a89c4c70dbb1e2929f7b0d84 (diff)
Closes COUCHDB-334 - Add JSONP support to CouchDB
Use JSONP by providing a ?callback=function_name URL paramter for any URL returning JSON data. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@774180 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_view.erl')
-rw-r--r--src/couchdb/couch_httpd_view.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl
index 016a391a..8db561ac 100644
--- a/src/couchdb/couch_httpd_view.erl
+++ b/src/couchdb/couch_httpd_view.erl
@@ -270,6 +270,8 @@ parse_view_param("reduce", Value) ->
[{reduce, parse_bool_param(Value)}];
parse_view_param("include_docs", Value) ->
[{include_docs, parse_bool_param(Value)}];
+parse_view_param("callback", _) ->
+ []; % Verified in the JSON response functions
parse_view_param(Key, Value) ->
[{extra, {Key, Value}}].