Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7724718FB8 for ; Thu, 12 Nov 2015 15:23:28 +0000 (UTC) Received: (qmail 47843 invoked by uid 500); 12 Nov 2015 15:23:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47764 invoked by uid 500); 12 Nov 2015 15:23:28 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 47361 invoked by uid 99); 12 Nov 2015 15:23:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 15:23:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8ED51E5E20; Thu, 12 Nov 2015 15:23:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Thu, 12 Nov 2015 15:23:29 -0000 Message-Id: <9c7a438fc2714a9890c8fa5ce3792f49@git.apache.org> In-Reply-To: <8417b1f17fab4521b764f25467565df4@git.apache.org> References: <8417b1f17fab4521b764f25467565df4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] cxf git commit: Fix setup of SSL with Jetty 9.3 Fix setup of SSL with Jetty 9.3 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e221ea5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e221ea5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e221ea5 Branch: refs/heads/3.1.x-fixes Commit: 2e221ea50c22d528b6b23dd0c0f0cc862e2d0fa4 Parents: a2398ca Author: Daniel Kulp Authored: Wed Nov 11 10:10:35 2015 -0500 Committer: Daniel Kulp Committed: Thu Nov 12 10:22:47 2015 -0500 ---------------------------------------------------------------------- .../apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2e221ea5/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 0b864f5..e6f0fed 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 @@ -583,6 +583,7 @@ public class JettyHTTPServerEngine implements ServerEngine { protected void doStart() throws Exception { setSslContext(createSSLContext(this)); super.doStart(); + checkKeyStore(); } public void checkKeyStore() { //we'll handle this later @@ -653,8 +654,8 @@ public class JettyHTTPServerEngine implements ServerEngine { String.class) .newInstance(sslcf, "HTTP/1.1"); connectionFactories.add(scf); - String proto = (major > 9 || (major == 9 && minor >= 3)) ? "SSL" : "SSL-HTTP"; - result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result, proto + "/1.1"); + String proto = (major > 9 || (major == 9 && minor >= 3)) ? "SSL" : "SSL-HTTP/1.1"; + result.getClass().getMethod("setDefaultProtocol", String.class).invoke(result, proto); } connectionFactories.add(httpFactory); result.getClass().getMethod("setConnectionFactories", Collection.class)