CXF-8936: Ensure correct ConnectionFactory ordering in Jetty transpor…

…t so that clients can negotiate h2 (#1454)
apache · Oct 4, 2023 · 202c510 · 202c510
1 parent edafd05
commit 202c510
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...s/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/...s/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -684,7 +684,6 @@ AbstractConnector createConnectorJetty(SslContextFactory.Server sslcf, String ho
             result = new org.eclipse.jetty.server.ServerConnector(server);
 
             if (tlsServerParameters != null) {
-                connectionFactories.add(httpFactory);
                 httpConfig.addCustomizer(new SecureRequestCustomizer(tlsServerParameters.isSniHostCheck()));
 
                 if (isHttp2Enabled(bus)) {
@@ -704,10 +703,14 @@ AbstractConnector createConnectorJetty(SslContextFactory.Server sslcf, String ho
                         }
                     }
                 }
-                if (connectionFactories.size() == 1) {
+
+                if (connectionFactories.isEmpty()) {
                     final SslConnectionFactory scf = new SslConnectionFactory(sslcf, httpFactory.getProtocol());
                     connectionFactories.add(scf);
                 }
+
+                // Ensure http/1.1 is last in the list so it is the lowest priority in ALPN
+                connectionFactories.add(httpFactory);
 
                 // Has to be set before the default protocol change
                 result.setConnectionFactories(connectionFactories);