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/06/12 18:11:05 UTC
svn commit: r546550 - in /jakarta/jmeter/branches/rel-2-2:
src/core/org/apache/jmeter/util/JsseSSLManager.java xdocs/changes.xml
Author: sebb
Date: Tue Jun 12 09:11:04 2007
New Revision: 546550
URL: http://svn.apache.org/viewvc?view=rev&rev=546550
Log:
Can't use Slow socket with Java https (JSSE)
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
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=546550&r1=546549&r2=546550
==============================================================================
--- 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 Tue Jun 12 09:11:04 2007
@@ -112,21 +112,25 @@
this.threadlocal = new ThreadLocal();
}
- // TODO allow CPS to be passed from the sampler to allow per-sampler speed variations
- HttpSSLProtocolSocketFactory sockFactory = new HttpSSLProtocolSocketFactory(this, cps);
+ /*
+ * Set up Java defaults.
+ * N.B. does not allow SlowSocket - fails with:
+ * java.lang.RuntimeException: Export restriction: this JSSE implementation is non-pluggable.
+ */
- HttpsURLConnection.setDefaultSSLSocketFactory(sockFactory);
+ HttpsURLConnection.setDefaultSSLSocketFactory(new HttpSSLProtocolSocketFactory(this));
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
public boolean verify(String hostname, SSLSession session) {
return true;
}
});
+
/*
* Also set up HttpClient defaults
*/
Protocol protocol = new Protocol(
JsseSSLManager.HTTPS,
- (ProtocolSocketFactory) sockFactory,
+ (ProtocolSocketFactory) new HttpSSLProtocolSocketFactory(this, cps),
443);
Protocol.registerProtocol(JsseSSLManager.HTTPS, protocol);
log.debug("SSL stuff all set");
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=546550&r1=546549&r2=546550
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Jun 12 09:11:04 2007
@@ -260,6 +260,7 @@
<li>Use Listener configuration when loading CSV data files</li>
<li>Function methods setParameters() need to be synchronized</li>
<li>Fix CLI long optional argument to require "=" (as for short options)</li>
+<li>Fix SlowSocket to work properly with Httpclient (both http and https)</li>
</ul>
<h3>Version 2.2</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org