fix not necessary use of DigestURL

pull/1/head
reger 12 years ago
parent 5111841e5b
commit 52dd491c04

@ -124,7 +124,7 @@ import org.eclipse.jetty.util.resource.ResourceFactory;
*/ */
public class YaCyDefaultServlet extends HttpServlet implements ResourceFactory { public class YaCyDefaultServlet extends HttpServlet implements ResourceFactory {
private static final long serialVersionUID = 4930458713846881193L; private static final long serialVersionUID = 4900000000000001110L;
private ServletContext _servletContext; private ServletContext _servletContext;
private boolean _acceptRanges = true; private boolean _acceptRanges = true;
private boolean _dirAllowed = true; private boolean _dirAllowed = true;
@ -985,6 +985,7 @@ public class YaCyDefaultServlet extends HttpServlet implements ResourceFactory {
OutputStream out = response.getOutputStream(); OutputStream out = response.getOutputStream();
// remove virtual host "currentyacypeer"
int off = 0; // starting offset int off = 0; // starting offset
int x = buffer.indexOf("/currentyacypeer/".getBytes(), off); int x = buffer.indexOf("/currentyacypeer/".getBytes(), off);
while (x >= 0) { while (x >= 0) {
@ -995,6 +996,7 @@ public class YaCyDefaultServlet extends HttpServlet implements ResourceFactory {
x = buffer.indexOf("/currentyacypeer/".getBytes(), off); x = buffer.indexOf("/currentyacypeer/".getBytes(), off);
} }
// check and handle SSI (ServerSideIncludes)
off = 0; off = 0;
int p = buffer.indexOf("<!--#".getBytes(), off); int p = buffer.indexOf("<!--#".getBytes(), off);
int q; int q;
@ -1011,6 +1013,7 @@ public class YaCyDefaultServlet extends HttpServlet implements ResourceFactory {
out.flush(); out.flush();
} }
// parse SSI line and include resource
private void parseSSI(final net.yacy.cora.util.ByteBuffer in, final int off, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { private void parseSSI(final net.yacy.cora.util.ByteBuffer in, final int off, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
if (in.startsWith("<!--#include virtual=\"".getBytes(), off)) { if (in.startsWith("<!--#include virtual=\"".getBytes(), off)) {
final int q = in.indexOf("\"".getBytes(), off + 22); final int q = in.indexOf("\"".getBytes(), off + 22);

@ -26,7 +26,7 @@ package net.yacy.http;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import net.yacy.cora.document.id.DigestURL; import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.Domains;
import net.yacy.search.Switchboard; import net.yacy.search.Switchboard;
@ -71,7 +71,7 @@ public class YaCySecurityHandler extends SecurityHandler {
String refererHost; String refererHost;
try { try {
refererHost = new DigestURL(request.getHeader("Referer")).getHost(); refererHost = new MultiProtocolURL(request.getHeader("Referer")).getHost();
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
refererHost = null; refererHost = null;
} }

Loading…
Cancel
Save