diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-04 19:14:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-04 19:14:25 +0100 |
commit | 31ea7d17f98e744497f9ff834e50d3612ca2678b (patch) | |
tree | 4c0e3270ffcfa1f8bf17037c577219f6b21c123c /jdisc_http_service | |
parent | 4efd76e4bb6a35a748237dca5825c9175598fd3f (diff) | |
parent | a7bfbb407c71e96d3a2effb34836d04ce3cd9d70 (diff) |
Merge pull request #12438 from vespa-engine/bjorncs/upgrade-jetty
Upgrade Jetty to 9.4.27
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index 01d6fa02d6e..55512314fe0 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -8,9 +8,9 @@ import com.yahoo.jdisc.http.ssl.SslContextFactoryProvider; import com.yahoo.security.tls.TransportSecurityUtils; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.ConnectionFactory; +import org.eclipse.jetty.server.DetectorConnectionFactory; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.OptionalSslConnectionFactory; import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; @@ -62,7 +62,7 @@ public class ConnectorFactory { switch (TransportSecurityUtils.getInsecureMixedMode()) { case TLS_CLIENT_MIXED_SERVER: case PLAINTEXT_CLIENT_MIXED_SERVER: - return List.of(newOptionalSslConnectionFactory(sslConnectionsFactory), sslConnectionsFactory, httpConnectionFactory); + return List.of(new DetectorConnectionFactory(sslConnectionsFactory), httpConnectionFactory); case DISABLED: return List.of(sslConnectionsFactory, httpConnectionFactory); default: @@ -93,8 +93,4 @@ public class ConnectorFactory { return new SslConnectionFactory(factory, HttpVersion.HTTP_1_1.asString()); } - private OptionalSslConnectionFactory newOptionalSslConnectionFactory(SslConnectionFactory sslConnectionsFactory) { - return new OptionalSslConnectionFactory(sslConnectionsFactory, HttpVersion.HTTP_1_1.asString()); - } - } |