boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

tried to fix some problems with latest changes to httpc

Browse Source 
very experimental!

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2078 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 19 years ago
parent 55c5b41bd0
commit 015d044c25
12 changed files with 78 additions and 85 deletions
Show Stats Download Patch File Download Diff File

2
htroot/ViewFile.java
Unescape View File

@ -144,7 +144,7 @@ public class ViewFile {
if (resHeader == null) { if (resHeader == null) {
resHeader = sb.cacheManager.getCachedResponse(urlEntry.hash()); resHeader = sb.cacheManager.getCachedResponse(urlEntry.hash());
if (resHeader == null) { if (resHeader == null) {
resHeader = httpc.whead(url,5000,null,null,sb.remoteProxyConfig); resHeader = httpc.whead(url,url.getHost(),5000,null,null,sb.remoteProxyConfig);
if (resource == null) { if (resource == null) {
prop.put("error",4); prop.put("error",4);
prop.put("viewMode",VIEW_MODE_NO_TEXT); prop.put("viewMode",VIEW_MODE_NO_TEXT);

4
source/de/anomic/data/robotsParser.java
Unescape View File

@ -309,9 +309,9 @@ public final class robotsParser{
(sb.remoteProxyConfig == null) || (sb.remoteProxyConfig == null) ||
(!sb.remoteProxyConfig.useProxy()) (!sb.remoteProxyConfig.useProxy())
) { ) {
con = httpc.getInstance(robotsURL.getHost(), robotsURL.getPort(), 10000, robotsURL.getProtocol().equalsIgnoreCase("https")); con = httpc.getInstance(robotsURL.getHost(), robotsURL.getHost(), robotsURL.getPort(), 10000, robotsURL.getProtocol().equalsIgnoreCase("https"));
} else { } else {
con = httpc.getInstance(robotsURL.getHost(), robotsURL.getPort(), 10000, robotsURL.getProtocol().equalsIgnoreCase("https"), sb.remoteProxyConfig); con = httpc.getInstance(robotsURL.getHost(), robotsURL.getHost(), robotsURL.getPort(), 10000, robotsURL.getProtocol().equalsIgnoreCase("https"), sb.remoteProxyConfig);
} }
// if we previously have downloaded this robots.txt then we can set the if-modified-since header // if we previously have downloaded this robots.txt then we can set the if-modified-since header

122
source/de/anomic/http/httpc.java
Unescape View File

@ -135,8 +135,9 @@ public final class httpc {
// class variables // class variables
private Socket socket = null; // client socket for commands private Socket socket = null; // client socket for commands
private Thread socketOwner = null; private Thread socketOwner = null;
private String host = null; private String adressed_host = null;
//private long timeout; private int adressed_port = 80;
private String target_virtual_host = null;
// output and input streams for client control connection // output and input streams for client control connection
PushbackInputStream clientInput = null; PushbackInputStream clientInput = null;
@ -146,12 +147,10 @@ public final class httpc {
private httpdByteCountOutputStream clientOutputByteCount = null; private httpdByteCountOutputStream clientOutputByteCount = null;
private boolean remoteProxyUse = false; private boolean remoteProxyUse = false;
private String savedRemoteHost = null;
private httpRemoteProxyConfig remoteProxyConfig = null; private httpRemoteProxyConfig remoteProxyConfig = null;
String requestPath = null; String requestPath = null;
private boolean allowContentEncoding = true; private boolean allowContentEncoding = true;
static boolean useYacyReferer = true;
public static boolean yacyDebugMode = false; public static boolean yacyDebugMode = false;
/** /**
@ -249,8 +248,8 @@ public final class httpc {
* Convert the status of this class into an String object to output it. * Convert the status of this class into an String object to output it.
*/ */
public String toString() { public String toString() {
return (this.savedRemoteHost == null) ? "Disconnected" : "Connected to " + this.savedRemoteHost + return (this.adressed_host == null) ? "Disconnected" : "Connected to " + this.adressed_host +
((this.remoteProxyUse) ? " via " + this.host : ""); ((this.remoteProxyUse) ? " via " + adressed_host : "");
} }
/** /**
@ -269,6 +268,7 @@ public final class httpc {
*/ */
public static httpc getInstance( public static httpc getInstance(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl, boolean ssl,
@ -289,6 +289,7 @@ public final class httpc {
try { try {
newHttpc.init( newHttpc.init(
server, server,
vhost,
port, port,
timeout, timeout,
ssl, ssl,
@ -305,21 +306,23 @@ public final class httpc {
public static httpc getInstance( public static httpc getInstance(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl, boolean ssl,
httpRemoteProxyConfig remoteProxyConfig httpRemoteProxyConfig remoteProxyConfig
) throws IOException { ) throws IOException {
return getInstance(server,port,timeout,ssl,remoteProxyConfig,null,null); return getInstance(server,vhost,port,timeout,ssl,remoteProxyConfig,null,null);
} }
public static httpc getInstance( public static httpc getInstance(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl boolean ssl
) throws IOException { ) throws IOException {
return getInstance(server,port,timeout,ssl,null,null); return getInstance(server,vhost,port,timeout,ssl,null,null);
} }
@ -336,6 +339,7 @@ public final class httpc {
*/ */
public static httpc getInstance( public static httpc getInstance(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl, boolean ssl,
@ -354,7 +358,7 @@ public final class httpc {
// initialize it // initialize it
try { try {
newHttpc.init(server,port,timeout,ssl,incomingByteCountAccounting,outgoingByteCountAccounting); newHttpc.init(server,vhost,port,timeout,ssl,incomingByteCountAccounting,outgoingByteCountAccounting);
} catch (IOException e) { } catch (IOException e) {
try{ httpc.theHttpcPool.returnObject(newHttpc); } catch (Exception e1) {} try{ httpc.theHttpcPool.returnObject(newHttpc); } catch (Exception e1) {}
throw e; throw e;
@ -499,6 +503,7 @@ public final class httpc {
*/ */
void init( void init(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl, boolean ssl,
@ -514,10 +519,12 @@ public final class httpc {
String remoteProxyHost = theRemoteProxyConfig.getProxyHost(); String remoteProxyHost = theRemoteProxyConfig.getProxyHost();
int remoteProxyPort = theRemoteProxyConfig.getProxyPort(); int remoteProxyPort = theRemoteProxyConfig.getProxyPort();
this.init(remoteProxyHost, remoteProxyPort, timeout, ssl,incomingByteCountAccounting,outgoingByteCountAccounting); this.init(remoteProxyHost, vhost, remoteProxyPort, timeout, ssl,incomingByteCountAccounting,outgoingByteCountAccounting);
this.remoteProxyUse = true; this.remoteProxyUse = true;
this.savedRemoteHost = server + ((port == 80) ? "" : (":" + port)); this.adressed_host = server;
this.adressed_port = port;
this.target_virtual_host = vhost;
this.remoteProxyConfig = theRemoteProxyConfig; this.remoteProxyConfig = theRemoteProxyConfig;
} }
@ -533,6 +540,7 @@ public final class httpc {
*/ */
void init( void init(
String server, String server,
String vhost,
int port, int port,
int timeout, int timeout,
boolean ssl, boolean ssl,
@ -542,15 +550,15 @@ public final class httpc {
//serverLog.logDebug("HTTPC", handle + " initialized"); //serverLog.logDebug("HTTPC", handle + " initialized");
this.remoteProxyUse = false; this.remoteProxyUse = false;
//this.timeout = timeout; //this.timeout = timeout;
//if(yacyDebugMode){ this.timeout=60000; }
this.savedRemoteHost = server;
try { try {
if (port == -1) { if (port == -1) {
port = (ssl)? 443 : 80; port = (ssl)? 443 : 80;
} }
this.host = server + ((port == 80) ? "" : (":" + port)); this.adressed_host = server;
this.adressed_port = port;
this.target_virtual_host = vhost;
InetAddress hostip; InetAddress hostip;
// if ((server.equals("localhost")) || (server.equals("127.0.0.1")) || (server.startsWith("192.168.")) || (server.startsWith("10."))) { // if ((server.equals("localhost")) || (server.equals("127.0.0.1")) || (server.startsWith("192.168.")) || (server.startsWith("10."))) {
// hostip = server; // hostip = server;
@ -640,12 +648,12 @@ public final class httpc {
this.clientOutputByteCount = null; this.clientOutputByteCount = null;
} }
this.host = null; this.adressed_host = null;
this.target_virtual_host = null;
//this.timeout = 0; //this.timeout = 0;
this.remoteProxyUse = false; this.remoteProxyUse = false;
this.remoteProxyConfig = null; this.remoteProxyConfig = null;
this.savedRemoteHost = null;
this.requestPath = null; this.requestPath = null;
this.allowContentEncoding = true; this.allowContentEncoding = true;
@ -715,10 +723,11 @@ public final class httpc {
// set the host attribute. This is in particular necessary, if we contact another proxy // set the host attribute. This is in particular necessary, if we contact another proxy
// the host is mandatory, if we use HTTP/1.1 // the host is mandatory, if we use HTTP/1.1
if (!(header.containsKey(httpHeader.HOST))) { if (!(header.containsKey(httpHeader.HOST))) {
if (this.remoteProxyUse) if (this.remoteProxyUse) {
header.put(httpHeader.HOST, this.savedRemoteHost); header.put(httpHeader.HOST, this.adressed_host);
else } else {
header.put(httpHeader.HOST, this.host); header.put(httpHeader.HOST, this.target_virtual_host);
}
} }
if (this.remoteProxyUse) { if (this.remoteProxyUse) {
@ -759,7 +768,7 @@ public final class httpc {
// send request // send request
if ((this.remoteProxyUse) && (!(method.equals(httpHeader.METHOD_CONNECT)))) if ((this.remoteProxyUse) && (!(method.equals(httpHeader.METHOD_CONNECT))))
path = (this.savedRemoteHost.endsWith("443")?"https://":"http://") + this.savedRemoteHost + path; path = ((this.adressed_port == 443) ? "https://" : "http://") + this.adressed_host + ":" + this.adressed_port + path;
serverCore.send(this.clientOutput, method + " " + path + " HTTP/1.0"); // if set to HTTP/1.1, servers give time-outs? serverCore.send(this.clientOutput, method + " " + path + " HTTP/1.0"); // if set to HTTP/1.1, servers give time-outs?
// send header // send header
@ -1044,7 +1053,8 @@ do upload
*/ */
public static byte[] singleGET( public static byte[] singleGET(
String host, String realhost,
String virtualhost,
int port, int port,
String path, String path,
int timeout, int timeout,
@ -1063,11 +1073,10 @@ do upload
httpc con = null; httpc con = null;
try { try {
if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy())) { if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy())) {
con = httpc.getInstance(host, port, timeout, ssl); con = httpc.getInstance(realhost, virtualhost, port, timeout, ssl);
} else { } else {
con = httpc.getInstance(host, port, timeout, ssl, theRemoteProxyConfig); con = httpc.getInstance(realhost, virtualhost, port, timeout, ssl, theRemoteProxyConfig);
} }
httpc.response res = con.GET(path, requestHeader); httpc.response res = con.GET(path, requestHeader);
@ -1085,6 +1094,7 @@ do upload
public static byte[] singleGET( public static byte[] singleGET(
URL u, URL u,
String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
@ -1096,7 +1106,7 @@ do upload
String path = u.getPath(); String path = u.getPath();
String query = u.getQuery(); String query = u.getQuery();
if ((query != null) && (query.length() > 0)) path = path + "?" + query; if ((query != null) && (query.length() > 0)) path = path + "?" + query;
return singleGET(u.getHost(), port, path, timeout, user, password, ssl, theRemoteProxyConfig, null); return singleGET(u.getHost(), vhost, port, path, timeout, user, password, ssl, theRemoteProxyConfig, null);
} }
/* /*
@ -1110,7 +1120,8 @@ do upload
*/ */
public static byte[] singlePOST( public static byte[] singlePOST(
String host, String realhost,
String virtualhost,
int port, int port,
String path, String path,
int timeout, int timeout,
@ -1131,9 +1142,9 @@ do upload
httpc con = null; httpc con = null;
try { try {
if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy())) { if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy())) {
con = httpc.getInstance(host, port, timeout, ssl); con = httpc.getInstance(realhost, virtualhost, port, timeout, ssl);
} else { } else {
con = httpc.getInstance(host, port, timeout, ssl, theRemoteProxyConfig); con = httpc.getInstance(realhost, virtualhost, port, timeout, ssl, theRemoteProxyConfig);
} }
httpc.response res = con.POST(path, requestHeader, props, files); httpc.response res = con.POST(path, requestHeader, props, files);
@ -1152,7 +1163,7 @@ do upload
public static byte[] singlePOST( public static byte[] singlePOST(
URL u, URL u,
String host, String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
@ -1168,6 +1179,7 @@ do upload
if ((query != null) && (query.length() > 0)) path = path + "?" + query; if ((query != null) && (query.length() > 0)) path = path + "?" + query;
return singlePOST( return singlePOST(
u.getHost(), u.getHost(),
vhost,
port, port,
path, path,
timeout, timeout,
@ -1205,13 +1217,13 @@ do upload
public static ArrayList wget( public static ArrayList wget(
URL url, URL url,
String host, String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
httpRemoteProxyConfig theRemoteProxyConfig httpRemoteProxyConfig theRemoteProxyConfig
) throws IOException { ) throws IOException {
return wget(url, host,timeout,user,password,theRemoteProxyConfig,null); return wget(url, vhost,timeout,user,password,theRemoteProxyConfig,null);
} }
public static ArrayList wget(URL url) throws IOException{ public static ArrayList wget(URL url) throws IOException{
@ -1220,7 +1232,7 @@ do upload
public static ArrayList wget( public static ArrayList wget(
URL url, URL url,
String host, String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
@ -1237,7 +1249,8 @@ do upload
// splitting of the byte array into lines // splitting of the byte array into lines
byte[] a = singleGET( byte[] a = singleGET(
host, url.getHost(),
vhost,
port, port,
path, path,
timeout, timeout,
@ -1287,16 +1300,18 @@ do upload
public static httpHeader whead( public static httpHeader whead(
URL url, URL url,
String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
httpRemoteProxyConfig theRemoteProxyConfig httpRemoteProxyConfig theRemoteProxyConfig
) throws IOException { ) throws IOException {
return whead(url,timeout,user,password,theRemoteProxyConfig,null); return whead(url,vhost,timeout,user,password,theRemoteProxyConfig,null);
} }
public static httpHeader whead( public static httpHeader whead(
URL url, URL url,
String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
@ -1316,14 +1331,14 @@ do upload
String path = url.getPath(); String path = url.getPath();
String query = url.getQuery(); String query = url.getQuery();
if ((query != null) && (query.length() > 0)) path = path + "?" + query; if ((query != null) && (query.length() > 0)) path = path + "?" + query;
String host = url.getHost(); String realhost = url.getHost();
// start connection // start connection
httpc con = null; httpc con = null;
try { try {
if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy())) if ((theRemoteProxyConfig == null)||(!theRemoteProxyConfig.useProxy()))
con = httpc.getInstance(host, port, timeout, ssl); con = httpc.getInstance(realhost, vhost, port, timeout, ssl);
else con = httpc.getInstance(host, port, timeout, ssl, theRemoteProxyConfig); else con = httpc.getInstance(realhost, vhost, port, timeout, ssl, theRemoteProxyConfig);
httpc.response res = con.HEAD(path, requestHeader); httpc.response res = con.HEAD(path, requestHeader);
if (res.status.startsWith("2")) { if (res.status.startsWith("2")) {
@ -1339,21 +1354,9 @@ do upload
} }
} }
/*
public static Vector wget(String url) {
try {
return wget(new URL(url), 5000, null, null, null, 0);
} catch (IOException e) {
Vector ll = new Vector();
ll.add("503 " + e.getMessage());
return ll;
}
}
*/
public static ArrayList wput( public static ArrayList wput(
URL url, URL url,
String host, String vhost,
int timeout, int timeout,
String user, String user,
String password, String password,
@ -1364,7 +1367,7 @@ do upload
// splitting of the byte array into lines // splitting of the byte array into lines
byte[] a = singlePOST( byte[] a = singlePOST(
url, url,
host, vhost,
timeout, timeout,
user, user,
password, password,
@ -1385,19 +1388,6 @@ do upload
return v; return v;
} }
/*
public static Vector wput(String url, serverObjects props) {
try {
return wput(url, 5000, null, null, null, 0, props);
} catch (IOException e) {
serverLog.logError("HTTPC", "wput exception for URL " + url + ": " + e.getMessage(), e);
Vector ll = new Vector();
ll.add("503 " + e.getMessage());
return ll;
}
}
*/
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("ANOMIC.DE HTTP CLIENT v" + vDATE); System.out.println("ANOMIC.DE HTTP CLIENT v" + vDATE);
String url = args[0]; String url = args[0];
@ -1692,7 +1682,7 @@ do upload
if (p > 0) { if (p > 0) {
this.responseHeader.add(buffer.substring(0, p).trim(), buffer.substring(p + 1).trim()); this.responseHeader.add(buffer.substring(0, p).trim(), buffer.substring(p + 1).trim());
} else { } else {
serverLog.logSevere("HTTPC", "RESPONSE PARSE ERROR: HOST='" + httpc.this.host + "', PATH='" + httpc.this.requestPath + "', STATUS='" + this.status + "'"); serverLog.logSevere("HTTPC", "RESPONSE PARSE ERROR: HOST='" + httpc.this.adressed_host + "', PATH='" + httpc.this.requestPath + "', STATUS='" + this.status + "'");
serverLog.logSevere("HTTPC", "..............BUFFER: " + buffer); serverLog.logSevere("HTTPC", "..............BUFFER: " + buffer);
throw new IOException(this.status); throw new IOException(this.status);
} }

3
source/de/anomic/http/httpdProxyHandler.java
Unescape View File

@ -1139,6 +1139,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt
httpc remoteProxy = null; httpc remoteProxy = null;
try { try {
remoteProxy = httpc.getInstance( remoteProxy = httpc.getInstance(
host,
host, host,
port, port,
timeout, timeout,
@ -1278,6 +1279,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt
// branch to server/proxy // branch to server/proxy
if (useProxy) { if (useProxy) {
return httpc.getInstance( return httpc.getInstance(
server,
server, server,
port, port,
timeout, timeout,
@ -1286,6 +1288,7 @@ public final class httpdProxyHandler extends httpdAbstractHandler implements htt
); );
} }
return httpc.getInstance( return httpc.getInstance(
server,
server, server,
port, port,
timeout, timeout,

2
source/de/anomic/plasma/parser/odt/odtParser.java
Unescape View File

@ -202,7 +202,7 @@ public class odtParser extends AbstractParser implements Parser {
testParser.setLogger(new serverLog("PARSER.ODT")); testParser.setLogger(new serverLog("PARSER.ODT"));
// downloading the document content // downloading the document content
byte[] content = httpc.singleGET(contentUrl, 10000, null, null, null); byte[] content = httpc.singleGET(contentUrl, contentUrl.getHost(), 10000, null, null, null);
ByteArrayInputStream input = new ByteArrayInputStream(content); ByteArrayInputStream input = new ByteArrayInputStream(content);
// parsing the document // parsing the document

2
source/de/anomic/plasma/parser/rpm/rpmParser.java
Unescape View File

@ -171,7 +171,7 @@ public class rpmParser extends AbstractParser implements Parser {
URL contentUrl = new URL(args[0]); URL contentUrl = new URL(args[0]);
rpmParser testParser = new rpmParser(); rpmParser testParser = new rpmParser();
byte[] content = httpc.singleGET(contentUrl, 10000, null, null, null); byte[] content = httpc.singleGET(contentUrl, contentUrl.getHost(), 10000, null, null, null);
ByteArrayInputStream input = new ByteArrayInputStream(content); ByteArrayInputStream input = new ByteArrayInputStream(content);
testParser.parse(contentUrl, "application/x-rpm", input); testParser.parse(contentUrl, "application/x-rpm", input);
} catch (Exception e) { } catch (Exception e) {

2
source/de/anomic/plasma/parser/vcf/vcfParser.java
Unescape View File

@ -260,7 +260,7 @@ public class vcfParser extends AbstractParser implements Parser {
URL contentUrl = new URL(args[0]); URL contentUrl = new URL(args[0]);
vcfParser testParser = new vcfParser(); vcfParser testParser = new vcfParser();
byte[] content = httpc.singleGET(contentUrl, 10000, null, null, null); byte[] content = httpc.singleGET(contentUrl, contentUrl.getHost(), 10000, null, null, null);
ByteArrayInputStream input = new ByteArrayInputStream(content); ByteArrayInputStream input = new ByteArrayInputStream(content);
testParser.parse(contentUrl, "text/x-vcard", input); testParser.parse(contentUrl, "text/x-vcard", input);
} catch (Exception e) { } catch (Exception e) {

4
source/de/anomic/plasma/plasmaCrawlWorker.java
Unescape View File

@ -345,8 +345,8 @@ public final class plasmaCrawlWorker extends Thread {
// open the connection // open the connection
remote = ((theRemoteProxyConfig != null) && (theRemoteProxyConfig.useProxy())) remote = ((theRemoteProxyConfig != null) && (theRemoteProxyConfig.useProxy()))
? httpc.getInstance(host, port, socketTimeout, ssl, theRemoteProxyConfig,"CRAWLER",null) ? httpc.getInstance(host, host, port, socketTimeout, ssl, theRemoteProxyConfig,"CRAWLER",null)
: httpc.getInstance(host, port, socketTimeout, ssl, "CRAWLER",null); : httpc.getInstance(host, host, port, socketTimeout, ssl, "CRAWLER",null);
// specifying if content encoding is allowed // specifying if content encoding is allowed
remote.setAllowContentEncoding(useContentEncodingGzip); remote.setAllowContentEncoding(useContentEncodingGzip);

2
source/de/anomic/plasma/plasmaParser.java
Unescape View File

@ -704,7 +704,7 @@ public final class plasmaParser {
contentURL = new URL(args[1]); contentURL = new URL(args[1]);
// downloading the document content // downloading the document content
byte[] contentBytes = httpc.singleGET(contentURL, 10000, null, null, null); byte[] contentBytes = httpc.singleGET(contentURL, contentURL.getHost(), 10000, null, null, null);
contentFile = File.createTempFile("content",".tmp"); contentFile = File.createTempFile("content",".tmp");
contentFile.deleteOnExit(); contentFile.deleteOnExit();

2
source/de/anomic/urlRedirector/urlRedirectord.java
Unescape View File

@ -181,7 +181,7 @@ public class urlRedirectord implements serverHandler {
URL reqURL = new URL(this.nextURL); URL reqURL = new URL(this.nextURL);
// getting URL mimeType // getting URL mimeType
httpHeader header = httpc.whead(reqURL, 10000, null, null, switchboard.remoteProxyConfig); httpHeader header = httpc.whead(reqURL, reqURL.getHost(), 10000, null, null, switchboard.remoteProxyConfig);
if (plasmaParser.supportedContent( if (plasmaParser.supportedContent(
plasmaParser.PARSER_MODE_URLREDIRECTOR, plasmaParser.PARSER_MODE_URLREDIRECTOR,

2
source/de/anomic/yacy/yacyPeerActions.java
Unescape View File

@ -183,7 +183,7 @@ public class yacyPeerActions {
reqHeader.put(httpHeader.CACHE_CONTROL,"no-cache"); reqHeader.put(httpHeader.CACHE_CONTROL,"no-cache");
url = new URL(seedListFileURL); url = new URL(seedListFileURL);
header = httpc.whead(url, this.bootstrapLoadTimeout, null, null, this.sb.remoteProxyConfig,reqHeader); header = httpc.whead(url, url.getHost(), this.bootstrapLoadTimeout, null, null, this.sb.remoteProxyConfig,reqHeader);
if ((header == null) || (header.lastModified() == null)) { if ((header == null) || (header.lastModified() == null)) {
yacyCore.log.logInfo("BOOTSTRAP: seed-list URL " + seedListFileURL + " not available"); yacyCore.log.logInfo("BOOTSTRAP: seed-list URL " + seedListFileURL + " not available");
} else if ((header.age() > 86400000) && (ssc > 0)) { } else if ((header.age() > 86400000) && (ssc > 0)) {

4
source/yacy.java
Unescape View File

@ -573,7 +573,7 @@ public final class yacy {
httpHeader requestHeader = new httpHeader(); httpHeader requestHeader = new httpHeader();
requestHeader.put("Authorization", "realm=" + encodedPassword); // for http-authentify requestHeader.put("Authorization", "realm=" + encodedPassword); // for http-authentify
try { try {
httpc con = httpc.getInstance("localhost", port, 10000, false); httpc con = httpc.getInstance("localhost", "localhost", port, 10000, false);
httpc.response res = con.GET("Steering.html?shutdown=", requestHeader); httpc.response res = con.GET("Steering.html?shutdown=", requestHeader);
// read response // read response
@ -1323,7 +1323,7 @@ public final class yacy {
URL newUrl = new URL(newUrlStr); URL newUrl = new URL(newUrlStr);
// doing a http head request to test if the url is correct // doing a http head request to test if the url is correct
theHttpc = httpc.getInstance(newUrl.getHost(), newUrl.getPort(), 30000, false); theHttpc = httpc.getInstance(newUrl.getHost(), newUrl.getHost(), newUrl.getPort(), 30000, false);
response res = theHttpc.HEAD(newUrl.getPath(), null); response res = theHttpc.HEAD(newUrl.getPath(), null);
if (res.statusCode == 200) { if (res.statusCode == 200) {

Write Preview
Loading…
Cancel
Save