You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/01/27 12:38:47 UTC

cxf git commit: [CXF-6761] Checking the hostname verifier, patch from Chris Ribble applied

Repository: cxf
Updated Branches:
  refs/heads/master 0966883ab -> 1fe6ef5fa


[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/1fe6ef5f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1fe6ef5f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1fe6ef5f

Branch: refs/heads/master
Commit: 1fe6ef5fa9aafa9e077e30fc5a87ac281df34a93
Parents: 0966883
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Jan 27 11:38:21 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Jan 27 11:38:21 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/1fe6ef5f/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);
             }