You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/03/18 20:58:54 UTC
svn commit: r519681 -
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
Author: sebb
Date: Sun Mar 18 12:58:54 2007
New Revision: 519681
URL: http://svn.apache.org/viewvc?view=rev&rev=519681
Log:
Use new HTTPSSLProtocolSocketFactory for HttpClient and Java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java?view=diff&rev=519681&r1=519680&r2=519681
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java Sun Mar 18 12:58:54 2007
@@ -185,7 +185,7 @@
* The following will need to be removed if the SSL properties are to be
* applied on a per-connection basis
*/
- HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
+ HttpsURLConnection.setDefaultSSLSocketFactory(new HttpSSLProtocolSocketFactory(context));
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
public boolean verify(String hostname, SSLSession session) {
return true;
@@ -196,7 +196,7 @@
*/
Protocol protocol = new Protocol(
JsseSSLManager.HTTPS,
- (ProtocolSocketFactory) new HttpClientSSLProtocolSocketFactory(context),
+ (ProtocolSocketFactory) new HttpSSLProtocolSocketFactory(context),
443
);
Protocol.registerProtocol(JsseSSLManager.HTTPS, protocol);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org