CAMEL-10222: Fixing compatibility with Jetty 9.3 (provided with spring-boot)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08791341 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08791341 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08791341 Branch: refs/heads/master Commit: 08791341466686285b9a5e8c948379973be3f7ba Parents: b124456 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Sep 8 11:52:32 2016 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Tue Sep 20 00:39:41 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/jetty9/JettyHttpComponent9.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/08791341/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java index 995dc78..48f8e80 100644 --- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java +++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java @@ -104,7 +104,8 @@ public class JettyHttpComponent9 extends JettyHttpComponent { httpConfig.addCustomizer(new org.eclipse.jetty.server.SecureRequestCustomizer()); SslConnectionFactory scf = new org.eclipse.jetty.server.SslConnectionFactory(sslcf, "HTTP/1.1"); connectionFactories.add(scf); - result.setDefaultProtocol("SSL-HTTP/1.1"); + // The protocol name can be "SSL" or "SSL-HTTP/1.1" depending on the version of Jetty + result.setDefaultProtocol(scf.getProtocol()); } connectionFactories.add(httpFactory); result.setConnectionFactories(connectionFactories);
