From 572cfe8fd4ba9d51a1a4df29fc8468a9f705107b Mon Sep 17 00:00:00 2001 From: reger Date: Sun, 26 Apr 2015 17:42:39 +0200 Subject: [PATCH] improve character encoding for urlproxy servlet for none utf-8 pages --- source/net/yacy/http/servlets/UrlProxyServlet.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/net/yacy/http/servlets/UrlProxyServlet.java b/source/net/yacy/http/servlets/UrlProxyServlet.java index 20d5722fc..6556aeac8 100644 --- a/source/net/yacy/http/servlets/UrlProxyServlet.java +++ b/source/net/yacy/http/servlets/UrlProxyServlet.java @@ -258,8 +258,14 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet { } // 9 - deliver to client - byte[] sbb = UTF8.getBytes(doc.toString()); - + byte[] sbb; + if (doc.charset() == null) { + sbb = UTF8.getBytes(doc.toString()); + response.setCharacterEncoding(UTF8.charset.name()); + } else { // keep orig charset + sbb = doc.toString().getBytes(doc.charset()); + response.setCharacterEncoding(doc.charset().name()); + } // add some proxy-headers to response header if (proxyResponseHeader.containsKey(HeaderFramework.SERVER)) { response.setHeader(HeaderFramework.SERVER, proxyResponseHeader.get(HeaderFramework.SERVER));