cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied
Date Wed, 27 Jan 2016 11:40:51 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 60166cfee -> 48aa8e93e


[CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied


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

Branch: refs/heads/3.1.x-fixes
Commit: 48aa8e93e8d5154d8b8ced10b35956b30147590f
Parents: 60166cf
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Jan 27 11:38:21 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Jan 27 11:40:33 2016 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/48aa8e93/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index 52e900f..cd440dc 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -282,7 +282,8 @@ public class ClientImpl implements Client {
             // TLS
             TLSClientParameters tlsParams = secConfig.getTlsClientParams();
             if (tlsParams.getSSLSocketFactory() != null 
-                || tlsParams.getTrustManagers() != null) {
+                || tlsParams.getTrustManagers() != null
+                || tlsParams.getHostnameVerifier() != null) {
                 clientCfg.getHttpConduit().setTlsClientParameters(tlsParams);
             }
             


Mime
View raw message