Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

Browse Source
This commit is contained in:
Michael Peter Christen 2014-03-21 11:37:46 +01:00
commit e2f2586429
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htroot/env/templates/jqueryheader.template vendored
View File

@ -1,11 +0,0 @@
<!-- jQuery header /env/jqueryheader.template -->
<link media="screen" type="text/css" href="/currentyacypeer/jquery/themes/start/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
<link media="screen" type="text/css" href="/currentyacypeer/jquery/css/jquery-ui-combobox.css" rel="stylesheet" />
<link media="screen" type="text/css" href="/currentyacypeer/jquery/css/jquery.tagsinput.css" rel="stylesheet" />
<script src="/currentyacypeer/jquery/js/jquery-1.7.min.js" type="text/javascript"></script>
<script src="/currentyacypeer/jquery/js/jquery-ui-1.8.16.custom.min.js" type="text/javascript"></script>
<script src="/currentyacypeer/jquery/js/jquery-ui-combobox.js" type="text/javascript"></script>
<script src="/currentyacypeer/jquery/js/jquery.tagsinput.min.js" type="text/javascript"></script>
<script src="/currentyacypeer/jquery/js/jquery.rdfquery.core-1.0.js" type="text/javascript"></script>
<!-- END jQuery header -->

1
source/net/yacy/http/servlets/YaCyDefaultServlet.java
View File

@ -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);

7
source/net/yacy/server/http/HTTPDProxyHandler.java
View File

@ -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);