From 0185e8a039281a1e12bab3c8c20399b75a0798f9 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 10 Jan 2020 14:18:57 +0100 Subject: Upgrade Apache httpclient+httpcore to newest version Use deprecated setSslcontext() in code that may run outside JDisc. --- .../java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jdisc_http_service') diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java index e206cb3215d..ffff63a424e 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java @@ -133,7 +133,7 @@ class HealthCheckProxyHandler extends HandlerWrapper { client = HttpClientBuilder.create() .disableAutomaticRetries() .setConnectionReuseStrategy(NoConnectionReuseStrategy.INSTANCE) - .setSslcontext(sslContextFactory.getSslContext()) + .setSSLContext(sslContextFactory.getSslContext()) .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE) .setUserTokenHandler(context -> null) // https://stackoverflow.com/a/42112034/1615280 .setUserAgent("health-check-proxy-client") -- cgit v1.2.3