You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/11/04 16:34:35 UTC
[1/2] git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 7a7abbb1a -> 9c275b132
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c275b13
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c275b13
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c275b13
Branch: refs/heads/2.7.x-fixes
Commit: 9c275b1321c12d4f60c4f41d011accc5ed2e0845
Parents: 2decfeb
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Nov 4 15:34:27 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 4 15:34:27 2014 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c275b13/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index da31626..4f328e4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -809,6 +809,7 @@ B 85c6cb558cabc1248fca9711b66a0dc15e3e6f83
B 85ecae5551365fa8a11a5245db2b84ada543107f
B 8601456b5f8725458c34c81a7a48d3f18497ae32
B 865036b9e1576360b34798c5fc89e81af96fbfe6
+B 866b9cc093e22071996013f773207d118bd767df
B 869b0807bd298a6e65e0a77b6ac8d26a34ac18b4
B 86a0bb61dc3442f28bb6b036bfa8f518c8576c7e
B 86d7c4b90bccf66e420ad68340d3ce4322e2544b
[2/2] git commit: Backmerging TLS client fix
Posted by co...@apache.org.
Backmerging TLS client fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2decfebc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2decfebc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2decfebc
Branch: refs/heads/2.7.x-fixes
Commit: 2decfebc9ead1d061c94f9fc781ab8878e4e7e8a
Parents: 7a7abbb
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Nov 4 15:33:29 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Nov 4 15:34:27 2014 +0000
----------------------------------------------------------------------
.../cxf/transport/https_jetty/CXFJettySslSocketConnector.java | 3 ---
.../org/apache/cxf/transport/https/HttpsURLConnectionFactory.java | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2decfebc/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
index 39d9953..c43dcab 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
@@ -116,9 +116,6 @@ public class CXFJettySslSocketConnector extends SslSelectChannelConnector {
if (!"SSLv3".equals(proto)) {
getSslContextFactory().addExcludeProtocols("SSLv3");
}
- if (!"SSLv2Hello".equals(proto)) {
- getSslContextFactory().addExcludeProtocols("SSLv2Hello");
- }
SSLContext context = getCxfSslContextFactory().getProvider() == null
? SSLContext.getInstance(proto)
http://git-wip-us.apache.org/repos/asf/cxf/blob/2decfebc/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
index ac8f90d..cd03a91 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
@@ -176,7 +176,7 @@ public class HttpsURLConnectionFactory {
// The SSLSocketFactoryWrapper enables certain cipher suites
// from the policy.
socketFactory = new SSLSocketFactoryWrapper(ctx.getSocketFactory(), cipherSuites,
- tlsClientParameters.getSecureSocketProtocol());
+ protocol);
//recalc the hashcode since somet of the above MAY have changed the tlsClientParameters
lastTlsHash = tlsClientParameters.hashCode();
} else {