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 2012/08/09 22:23:57 UTC
svn commit: r1371437 -
/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Author: dkulp
Date: Thu Aug 9 20:23:57 2012
New Revision: 1371437
URL: http://svn.apache.org/viewvc?rev=1371437&view=rev
Log:
Merged revisions 1371406 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1371406 | dkulp | 2012-08-09 15:25:15 -0400 (Thu, 09 Aug 2012) | 10 lines
Merged revisions 1368471 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1368471 | gmazza | 2012-08-02 09:41:34 -0400 (Thu, 02 Aug 2012) | 2 lines
Better troubleshooting message with CN mismatch error
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1371437&r1=1371436&r2=1371437&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Aug 9 20:23:57 2012
@@ -1334,8 +1334,9 @@ public class HTTPConduit
if (e.getMessage() != null && e.getMessage().contains("HTTPS hostname wrong:")) {
throw new IOException("The https URL hostname does not match the "
+ "Common Name (CN) on the server certificate in the client's truststore. "
- + "To disable this check (NOT recommended for production) set the CXF "
- + "client TLS configuration property \"disableCNCheck\" to true.");
+ + "Make sure server certificate is correct, or to disable this check "
+ + "(NOT recommended for production) set the CXF client TLS "
+ + "configuration property \"disableCNCheck\" to true.");
} else {
throw e;
}