Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
fix to timeout
Michael Christen74104ff2d355
diff --git a/source/net/yacy/cora/protocol/http/HTTPClient.java b/source/net/yacy/cora/protocol/http/HTTPClient.javaindex 063433518..d9e74baa9 100644--- a/source/net/yacy/cora/protocol/http/HTTPClient.java+++ b/source/net/yacy/cora/protocol/http/HTTPClient.java@@ -132,7 +132,7 @@ public class HTTPClient implements Closeable {/** Default maximum time in seconds to keep alive an idle connection in the pool */private static final int DEFAULT_POOLED_CONNECTION_TIME_TO_LIVE = 30;- private static final RequestConfig DFLTREQUESTCONFIG = initRequestConfig();+ private static RequestConfig DFLTREQUESTCONFIG = initRequestConfig(default_timeout);/** Use the custom YaCyDigestScheme for HTTP Digest Authentication */private static final Lookup<AuthSchemeProvider> AUTHSCHEMEREGISTRY = RegistryBuilder.<AuthSchemeProvider>create()@@ -198,15 +198,15 @@ public class HTTPClient implements Closeable {setTimout(timeout);}- private static RequestConfig initRequestConfig() {+ private static RequestConfig initRequestConfig(int timeout) {final RequestConfig.Builder builder = RequestConfig.custom();// IMPORTANT - if not set to 'false' then servers do not process the request until a time-out of 2 secondsbuilder.setExpectContinueEnabled(false);// timeout in milliseconds until a connection is established in milliseconds- builder.setConnectionRequestTimeout(default_timeout);- builder.setConnectTimeout(default_timeout);+ builder.setConnectionRequestTimeout(timeout);+ builder.setConnectTimeout(timeout);// SO_TIMEOUT: maximum period inactivity between two consecutive data packets in milliseconds- builder.setSocketTimeout(default_timeout);+ builder.setSocketTimeout(timeout);// ignore cookies, cause this may cause segfaults in default cookiestore and is not neededbuilder.setCookieSpec(CookieSpecs.IGNORE_COOKIES);builder.setRedirectsEnabled(true);@@ -265,7 +265,7 @@ public class HTTPClient implements Closeable {// Defines whether the socket can be bound even though a previous connection is still in a timeout state..setSoReuseAddress(true)// SO_TIMEOUT: maximum period inactivity between two consecutive data packets in milliseconds- .setSoTimeout(3000)+ .setSoTimeout(default_timeout)// conserve bandwidth by minimizing the number of segments that are sent.setTcpNoDelay(false).build();@@ -343,6 +343,7 @@ public class HTTPClient implements Closeable {this.reqConfBuilder.setSocketTimeout(timeout);this.reqConfBuilder.setConnectTimeout(timeout);this.reqConfBuilder.setConnectionRequestTimeout(timeout);+ DFLTREQUESTCONFIG = initRequestConfig(timeout);}/**