lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-25 15:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from nlevitt/hc43

Browse Source 
Switch to BasicHttpClientConnectionManager instead of PoolingHttpClientConnectionManager
This commit is contained in:
Kenji Nagahashi
2014-01-24 16:43:06 -08:00
parent b1b2f2bc42 6b72ac9705
commit 7353f62d84
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/src/main/java/org/archive/modules/fetcher/FetchHTTPRequest.java
+8 -5
View File
@@ -81,9 +81,9 @@ import org.apache.http.impl.DefaultBHttpClientConnection;
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.apache.http.impl.conn.DefaultHttpResponseParserFactory;
import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.impl.io.DefaultHttpRequestWriterFactory;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.HttpMessageWriterFactory;
@@ -144,6 +144,8 @@ class FetchHTTPRequest {
protected HttpHost targetHost;
protected boolean addedCredentials;
protected HttpHost proxyHost;
// make this a member variable so it doesn't get gc'd prematurely
protected HttpClientConnectionManager connMan;
public FetchHTTPRequest(FetchHTTP fetcher, CrawlURI curi) throws URIException {
this.fetcher = fetcher;
@@ -423,8 +425,8 @@ class FetchHTTPRequest {
httpClientBuilder.setDefaultCookieStore(fetcher.getCookieStore());
HttpClientConnectionManager connManager = buildConnectionManager();
httpClientBuilder.setConnectionManager(connManager);
connMan = buildConnectionManager();
httpClientBuilder.setConnectionManager(connMan);
}
protected HttpClientConnectionManager buildConnectionManager() {
@@ -464,11 +466,12 @@ class FetchHTTPRequest {
DefaultHttpResponseParserFactory.INSTANCE);
}
};
PoolingHttpClientConnectionManager connMan = new PoolingHttpClientConnectionManager(socketFactoryRegistry, connFactory, dnsResolver);
BasicHttpClientConnectionManager connMan = new BasicHttpClientConnectionManager(
socketFactoryRegistry, connFactory, null, dnsResolver);
SocketConfig.Builder socketConfigBuilder = SocketConfig.custom();
socketConfigBuilder.setSoTimeout(fetcher.getSoTimeoutMs());
connMan.setDefaultSocketConfig(socketConfigBuilder.build());
connMan.setSocketConfig(socketConfigBuilder.build());
return connMan;
}