You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/07/01 21:48:38 UTC
[1/3] git commit: [CXF-5836] Fix NPE when nonProxyHosts is used Patch
from Nicolas Sprauel applied
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes cf6ea8ef9 -> eea391ab1
[CXF-5836] Fix NPE when nonProxyHosts is used
Patch from Nicolas Sprauel applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b85c6a1c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b85c6a1c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b85c6a1c
Branch: refs/heads/2.7.x-fixes
Commit: b85c6a1c3418796e5c142956c4f2662e1ad9502a
Parents: cf6ea8e
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jul 1 14:53:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jul 1 15:48:07 2014 -0400
----------------------------------------------------------------------
.../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b85c6a1c/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 9855641..48d3983 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -202,7 +202,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
Integer.valueOf((int) csPolicy.getReceiveTimeout()));
Proxy p = proxyFactory.createProxy(csPolicy , uri);
- if (p != null) {
+ if (p != null && p.type() != Proxy.Type.DIRECT) {
InetSocketAddress isa = (InetSocketAddress)p.address();
HttpHost proxy = new HttpHost(isa.getHostName(), isa.getPort());
ConnRouteParams.setDefaultProxy(e.getParams(), proxy);
[2/3] git commit: [CXF-5818] Fix stackoverflow with TLS
Posted by dk...@apache.org.
[CXF-5818] Fix stackoverflow with TLS
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0f0447ec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0f0447ec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0f0447ec
Branch: refs/heads/2.7.x-fixes
Commit: 0f0447ec9683684fe5e31571f1e06db62f295e2c
Parents: b85c6a1
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jul 1 15:21:48 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jul 1 15:48:18 2014 -0400
----------------------------------------------------------------------
.../apache/cxf/transport/https/HttpsURLConnectionFactory.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0f0447ec/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 449656c..d8b9001 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
@@ -174,6 +174,8 @@ public class HttpsURLConnectionFactory {
// from the policy.
socketFactory = new SSLSocketFactoryWrapper(ctx.getSocketFactory(), cipherSuites,
tlsClientParameters.getSecureSocketProtocol());
+ //recalc the hashcode since somet of the above MAY have changed the tlsClientParameters
+ lastTlsHash = tlsClientParameters.hashCode();
} else {
// ssl socket factory already initialized, reuse it to benefit of keep alive
}
@@ -261,7 +263,8 @@ public class HttpsURLConnectionFactory {
KeyManager[] keyManagers) throws GeneralSecurityException {
if (tlsClientParameters.getCertAlias() != null) {
for (int idx = 0; idx < keyManagers.length; idx++) {
- if (keyManagers[idx] instanceof X509KeyManager) {
+ if (keyManagers[idx] instanceof X509KeyManager
+ && !(keyManagers[idx] instanceof AliasedX509ExtendedKeyManager)) {
try {
keyManagers[idx] = new AliasedX509ExtendedKeyManager(
tlsClientParameters.getCertAlias(), (X509KeyManager)keyManagers[idx]);
[3/3] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
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/eea391ab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eea391ab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eea391ab
Branch: refs/heads/2.7.x-fixes
Commit: eea391ab15742c2eb26cace2034554a77508287e
Parents: 0f0447e
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jul 1 15:48:19 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jul 1 15:48:19 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/eea391ab/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 802ccfa..bdd8fca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1172,6 +1172,7 @@ M 0e45e5ef79b8f0deb04c35262dc05965fefac73a
M 0edab8ddfc537e3cc3bb36cf206397e9ea132888
M 0ede8ff165e93afc86f8d45a64bdafc7e53527c8
M 0fdc68f4cd45715a57f0aabd1c8f33da556bf50e
+M 0fdde9e2b7057328a71c978a0b1727a80a8078db
M 0feb9222ddcb94464356e12ee9a0da88576514ca
M 1022b96f3cbb1f064f3838a008eda420ea74762e
M 1026909f918661c6d25080a9932f4d63af017a31