summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search
diff options
context:
space:
mode:
authorLester Solbakken <lesters@yahoo-inc.com>2016-08-12 13:26:51 +0200
committerLester Solbakken <lesters@yahoo-inc.com>2016-08-12 13:26:51 +0200
commit3bcb02551772dcc9a7ef762a2da37f11b2872699 (patch)
tree5dbb62d22338e5860c70802e0b7676b749599137 /container-search/src/main/java/com/yahoo/search
parent64828a3afbe4a13764573e4b6badce784ded6cd4 (diff)
Add comment about JSONP support
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index 0030e61b277..1d400056d52 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -790,6 +790,14 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
return (Result) r;
}
+ /**
+ * Adds JSONP (Json with padding) support.
+ *
+ * Basically, if the JSON renderer receives a query parameter "jsoncallback=...",
+ * the JSON response will be wrapped in a function call with the name specified
+ * by the client. This side-steps the same-origin policy, thus supports calling
+ * Vespa from javascript loaded from a different domain then the Vespa instance.
+ */
private void beginJsonCallback(OutputStream stream) throws IOException {
if (shouldRenderJsonCallback()) {
String jsonCallback = getJsonCallback() + "(";