Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
Expand Down Expand Up @@ -51,7 +53,10 @@ public ApacheHttpClient(Credentials credentials, JsonTransformer jsonTransformer
this.credentials = credentials;
this.jsonTransformer = jsonTransformer;
this.defaultHeaders = defaultHeaders;
this.httpClient = HttpClientBuilder.create().build();
this.httpClient = HttpClientBuilder
.create()
.setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build())
.build();
}

public ApacheHttpClient(Credentials credentials, JsonTransformer jsonTransformer, Map<String, ?> defaultHeaders, ClientConfig.Host proxy, ClientConfig.UsernamePasswordCredentials proxyCreds) {
Expand All @@ -63,13 +68,17 @@ public ApacheHttpClient(Credentials credentials, JsonTransformer jsonTransformer
this.httpClient = (proxy != null)
? HttpClientBuilder.create()
.setProxy(new HttpHost(proxy.getHost(), proxy.getPort()))
.setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build())
.setDefaultCredentialsProvider((proxyCreds != null)
? new BasicCredentialsProvider() {{
setCredentials(new AuthScope(proxy.getHost(), proxy.getPort()), new UsernamePasswordCredentials(proxyCreds.getUsername(), proxyCreds.getPassword()));
}}
: new BasicCredentialsProvider())
.build()
: HttpClientBuilder.create().build();
: HttpClientBuilder
.create()
.setDefaultRequestConfig(RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build())
.build();
}

@Override
Expand Down