summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-07-26 10:56:10 +0200
committerGitHub <noreply@github.com>2019-07-26 10:56:10 +0200
commita648061adf908de45dd3f119a1782695f64e4110 (patch)
treeaccde6fad622d7e95e8360716758b7a5939e0714
parent18c4ddf8b5916186bf1859068c273225401aad36 (diff)
parent42f638353106031e418e63b752d2686c7d860353 (diff)
Merge pull request #10100 from vespa-engine/revert-10095-bjorncs/vespa-http-client
Revert "Adjust connection time to live to be more TLS friendly"
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
index aa39f5fa383..0b92427bcbe 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
@@ -406,7 +406,7 @@ class ApacheGatewayConnection implements GatewayConnection {
}
clientBuilder.setMaxConnPerRoute(1);
clientBuilder.setMaxConnTotal(1);
- clientBuilder.setConnectionTimeToLive(1, TimeUnit.MINUTES);
+ clientBuilder.setConnectionTimeToLive(15, TimeUnit.SECONDS);
clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion));
clientBuilder.setDefaultHeaders(Collections.singletonList(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion)));
clientBuilder.disableContentCompression();