From da413af664cb3e5783a5a6c453c32514353ea539 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Fri, 4 Apr 2014 03:11:16 +0200
Subject: [PATCH] move baseurl after parsing orig source in urlproxyservlet to
 calculate absolute href links for rewrite from unmodified source.

---
 .../yacy/http/servlets/UrlProxyServlet.java   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/source/net/yacy/http/servlets/UrlProxyServlet.java b/source/net/yacy/http/servlets/UrlProxyServlet.java
index 586b5b004..4870ec6c8 100644
--- a/source/net/yacy/http/servlets/UrlProxyServlet.java
+++ b/source/net/yacy/http/servlets/UrlProxyServlet.java
@@ -195,7 +195,7 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet {
             response.setStatus(httpStatus);
             response.setContentType(mimeType);
             
-            if ((httpStatus) == 200 &&(mimeType != null) && (mimeType.startsWith("text/html") || mimeType.startsWith("text"))) {
+            if ((httpStatus == HttpServletResponse.SC_OK) &&(mimeType != null) && (mimeType.startsWith("text/html") || mimeType.startsWith("text"))) {
                 if (proxyResponseHeader.containsKey(HeaderFramework.TRANSFER_ENCODING) && proxyResponseHeader.get(HeaderFramework.TRANSFER_ENCODING).contains("chunked")) {
                      proxyout = new ChunkedInputStream(proxyout);
                 }
@@ -204,21 +204,11 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet {
                 final String servletstub = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getServletPath() + "?url=";
                 Document doc;
                 try {            
-                    doc = Jsoup.parse(proxyout, "UTF-8", proxyurl.toString());                    
-                } catch (Exception eio) {
+                    doc = Jsoup.parse(proxyout, UTF8.charset.name(), proxyurl.toString());
+                } catch (IOException eio) {
                     response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,"Proxy: parser error on " + proxyurl.toString());
                     return;
                 }
-                Element hd = doc.head();
-                if (hd != null) {
-                    // add a base url if not exist (to make sure relative links point to original)
-                    Elements basetags = hd.getElementsByTag("base");
-                    if (basetags.isEmpty()) {
-                        Element newbasetag = hd.prependElement("base");
-                        String basestr = proxyurl.getProtocol() + "://" + hostwithport + proxyurl.getPath(); //+directory;
-                        newbasetag.attr("href", basestr);
-                    }
-                }
 
                 Element bde = doc.body(); // start with body element to rewrite href links
                 // rewrite all href with abs proxy url (must be abs because of <base> head tag
@@ -245,6 +235,17 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet {
                     }
                 }
 
+                Element hd = doc.head();
+                if (hd != null) {
+                    // add a base url if not exist (to make sure relative links point to original)
+                    Elements basetags = hd.getElementsByTag("base");
+                    if (basetags.isEmpty()) {
+                        Element newbasetag = hd.prependElement("base");
+                        String basestr = proxyurl.getProtocol() + "://" + hostwithport + proxyurl.getPath(); //+directory;
+                        newbasetag.attr("href", basestr);
+                        }
+                    }
+
                 // 8 - add interaction elements (e.g. proxy exit button to switch back to original url)
                 // TODO: use a template file for
                 //de.prepend("<div><form action='" + proxyurl + "'><input type='submit' value='YaCy stop proxy' /></form></div>");