cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: Get the SSL tests passing with Jetty 9
Date Thu, 07 Aug 2014 13:03:47 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 69fc87a74 -> 6256b7c7c


Get the SSL tests passing with Jetty 9


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6256b7c7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6256b7c7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6256b7c7

Branch: refs/heads/master
Commit: 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
Parents: 69fc87a
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Aug 7 09:03:04 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Aug 7 09:03:18 2014 -0400

----------------------------------------------------------------------
 .../org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6256b7c7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
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 fb60d39..7057fd6 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
@@ -563,12 +563,12 @@ public class JettyHTTPServerEngine
                                                           Server.class);
                 httpConfig.getClass().getMethod("addCustomizer", src.getInterfaces()[0])
                     .invoke(httpConfig, src.newInstance());
-
                 Object scf = ClassLoaderUtils.loadClass("org.eclipse.jetty.server.SslConnectionFactory",
                                                         Server.class).getConstructor(SslContextFactory.class,
                                                                                      String.class)
                                                         .newInstance(sslcf, "HTTP/1.1");
                 connectionFactories.add(scf);
+                result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result,
"SSL-HTTP/1.1");
             }
             connectionFactories.add(httpFactory);
             result.getClass().getMethod("setConnectionFactories", Collection.class)


Mime
View raw message