From 280e36c90bbc73de02ead752d228d324b53cfe15 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Thu, 27 Sep 2012 12:02:24 +0200 Subject: [PATCH] allow Cross-Origin Resource Sharing for all stream servlets, that is the solr and the gsa search interface. That means that all JavaScript in browsers now can Cross-Origin access all YaCy search interfaces, which opens the option of 'YaCy Client in Browser' and 'End-Point Fail-over' concepts. --- htroot/Network.java | 1 - source/net/yacy/server/http/HTTPDFileHandler.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/htroot/Network.java b/htroot/Network.java index 92b174e79..7c9aa1544 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -64,7 +64,6 @@ public class Network { final Switchboard sb = (Switchboard) switchboard; final long start = System.currentTimeMillis(); - // final serverObjects prop = new serverObjects(); final servletProperties prop = new servletProperties(); prop.put("menu", post == null ? 2 : (post.get("menu", "").equals("embed")) ? 0 : (post.get("menu","").equals("simple")) ? 1 : 2); diff --git a/source/net/yacy/server/http/HTTPDFileHandler.java b/source/net/yacy/server/http/HTTPDFileHandler.java index a2c2bbf12..ecd5b75e8 100644 --- a/source/net/yacy/server/http/HTTPDFileHandler.java +++ b/source/net/yacy/server/http/HTTPDFileHandler.java @@ -884,6 +884,7 @@ public final class HTTPDFileHandler { // prepare response header ResponseHeader header = new ResponseHeader(200); header.put(HeaderFramework.CONTENT_TYPE, getMimeFromServlet(targetClass, requestHeader, args, "text/xml")); + header.put(HeaderFramework.CORS_ALLOW_ORIGIN, "*"); // allow Cross-Origin Resource Sharing for all stream servlets conProp.remove(HeaderFramework.CONNECTION_PROP_PERSISTENT); final boolean zipContent = requestHeader.acceptGzip(); if (zipContent) header.put(HeaderFramework.CONTENT_ENCODING, "gzip");