This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 959a5ac250639580d54bb87ec70e88441221d23e Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Mar 10 09:45:52 2020 +0000 Configure sendServerVersion for OSGi/Blueprint (cherry picked from commit b9380e98129bcbdc5d3f6e8f4efac5949df70f25) (cherry picked from commit d9ff27ad39eadd500e9db76a134bf802518f7496) --- .../http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java | 4 +++- .../cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java index 25bf7ca..4d48a89 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java @@ -146,7 +146,9 @@ public class JettyHTTPServerEngineFactoryHolder { if (engine.isContinuationsEnabled() != null) { eng.setContinuationsEnabled(engine.isContinuationsEnabled()); } - + if (engine.isSendServerVersion() != null) { + eng.setSendServerVersion(engine.isSendServerVersion()); + } if (engine.getHost() != null && !StringUtils.isEmpty(engine.getHost())) { eng.setHost(engine.getHost()); } diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java index 7dd9d42..4230e1a 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java @@ -139,6 +139,8 @@ public class HTTPJettyTransportActivator e.setSessionSupport(Boolean.parseBoolean((String)properties.get(k))); } else if ("continuationsEnabled".equals(k)) { e.setContinuationsEnabled(Boolean.parseBoolean((String)properties.get(k))); + } else if ("sendServerVersion".equals(k)) { + e.setSendServerVersion(Boolean.parseBoolean((String)properties.get(k))); } else if ("reuseAddress".equals(k)) { e.setReuseAddress(Boolean.parseBoolean((String)properties.get(k))); } else if ("maxIdleTime".equals(k)) {
