You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/08/27 15:19:06 UTC
[cxf] branch main updated: Fixing Jetty HTTP server connection factories initialization sequence
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new ac271acc03 Fixing Jetty HTTP server connection factories initialization sequence
ac271acc03 is described below
commit ac271acc035224d6e372e55535f5049072534a00
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Aug 27 11:18:47 2022 -0400
Fixing Jetty HTTP server connection factories initialization sequence
---
.../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 8eee39a53b..a184d56b2c 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -698,13 +698,15 @@ public class JettyHTTPServerEngine implements ServerEngine, HttpServerEngineSupp
connectionFactories.add(new HTTP2ServerConnectionFactory(httpConfig));
}
+ // Has to be set before the default protocol change
+ result.setConnectionFactories(connectionFactories);
+
String proto = (major > 9 || (major == 9 && minor >= 3)) ? "SSL" : "SSL-HTTP/1.1";
result.setDefaultProtocol(proto);
} else if (isHttp2Enabled(bus)) {
connectionFactories.add(new HTTP2CServerConnectionFactory(httpConfig));
+ result.setConnectionFactories(connectionFactories);
}
-
- result.setConnectionFactories(connectionFactories);
if (getMaxIdleTime() > 0) {
result.setIdleTimeout(Long.valueOf(getMaxIdleTime()));