Merge origin/master into jetty

Conflicts: source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java
11 years ago · 4684330505
parent 1437c45383 87a956e881
commit 4684330505
1 changed files with 2 additions and 2 deletions
--- a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java
+++ b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java
@ -60,7 +60,7 @@ public class HTMLResponseWriter implements QueryResponseWriter {

    @Override
    public String getContentType(final SolrQueryRequest request, final SolrQueryResponse response) {
-        return "text/html";
+        return CONTENT_TYPE_XML_UTF8;
    }

    @Override