From c297de51457293bd8aa1957d07ba3a5e6f91f6b7 Mon Sep 17 00:00:00 2001 From: reger Date: Fri, 21 Mar 2014 03:02:19 +0100 Subject: [PATCH] remove check for unused virtual path /currentyacypeer/ - del jqueryheader.template (not used) --- htroot/env/templates/jqueryheader.template | 11 ----------- source/net/yacy/http/servlets/YaCyDefaultServlet.java | 1 - source/net/yacy/server/http/HTTPDProxyHandler.java | 7 ------- 3 files changed, 19 deletions(-) delete mode 100644 htroot/env/templates/jqueryheader.template diff --git a/htroot/env/templates/jqueryheader.template b/htroot/env/templates/jqueryheader.template deleted file mode 100644 index 8c8a08051..000000000 --- a/htroot/env/templates/jqueryheader.template +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/source/net/yacy/http/servlets/YaCyDefaultServlet.java b/source/net/yacy/http/servlets/YaCyDefaultServlet.java index 31c9bf391..201ca5016 100644 --- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java +++ b/source/net/yacy/http/servlets/YaCyDefaultServlet.java @@ -247,7 +247,6 @@ public class YaCyDefaultServlet extends HttpServlet { } } - if (pathInfo.startsWith("/currentyacypeer/")) pathInfo = pathInfo.substring(16); String pathInContext = URIUtil.addPaths(servletPath, pathInfo); boolean endsWithSlash = (pathInfo == null ? request.getServletPath() : pathInfo).endsWith(URIUtil.SLASH); diff --git a/source/net/yacy/server/http/HTTPDProxyHandler.java b/source/net/yacy/server/http/HTTPDProxyHandler.java index 985638fc5..40bced646 100644 --- a/source/net/yacy/server/http/HTTPDProxyHandler.java +++ b/source/net/yacy/server/http/HTTPDProxyHandler.java @@ -430,13 +430,6 @@ public final class HTTPDProxyHandler { host = host.substring(0, pos); } - // point virtual directory to my peer - if (path.startsWith("/currentyacypeer/")) { - host = sb.peers.myIP(); - port = sb.peers.myPort(); - path = path.substring(16); - } - // resolve yacy and yacyh domains String yAddress = resolveYacyDomains(host);