From baa5d9b9e36897f384922cd9ba41f3c647349c7a Mon Sep 17 00:00:00 2001 From: reger Date: Sat, 17 Dec 2016 01:33:00 +0100 Subject: [PATCH] adjust DomainHandler working on resolved .yacy domain (remove obsolete check for path on hostname) --- source/net/yacy/http/YacyDomainHandler.java | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/source/net/yacy/http/YacyDomainHandler.java b/source/net/yacy/http/YacyDomainHandler.java index 149b5853d..989b99916 100644 --- a/source/net/yacy/http/YacyDomainHandler.java +++ b/source/net/yacy/http/YacyDomainHandler.java @@ -58,25 +58,14 @@ public class YacyDomainHandler extends AbstractHandler implements Handler { @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - String host = request.getServerName(); - String resolved = alternativeResolvers.resolve(host); + String host = request.getServerName(); // is hostname (without port) + String resolved = alternativeResolvers.resolve(host); // is a host|ip with port if (resolved != null) { - // split resolved into host, port and path - String path; - String hostPort; - int posPath = resolved.indexOf('/'); - if (posPath >= 0) { - path = resolved.substring(posPath); - hostPort = resolved.substring(0, posPath); - } else { - path = ""; - hostPort = resolved; - } - int newPort = Domains.stripToPort(hostPort); - String newHost = Domains.stripToHostName(hostPort); + int newPort = Domains.stripToPort(resolved); + String newHost = Domains.stripToHostName(resolved); if (alternativeResolvers.myIPs().contains(newHost)) return; if (Domains.isLocal(newHost, null)) return; - RequestDispatcher dispatcher = request.getRequestDispatcher(path + target); + RequestDispatcher dispatcher = request.getRequestDispatcher(target); dispatcher.forward(new DomainRequestWrapper(request, newHost, newPort), response); baseRequest.setHandled(true); }