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 17:25:03 UTC
svn commit: r546527 -
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JsseSSLManager.java
Author: sebb
Date: Tue Jun 12 08:25:03 2007
New Revision: 546527
URL: http://svn.apache.org/viewvc?view=rev&rev=546527
Log:
Handle CPS setup here for now
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=546527&r1=546526&r2=546527
==============================================================================
--- 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 08:25:03 2007
@@ -68,9 +68,17 @@
private static final boolean SHARED_SESSION_CONTEXT =
JMeterUtils.getPropDefault("https.sessioncontext.shared",false); // $NON-NLS-1$
+ private static final int cps;
+
static {
log.info("Using default SSL protocol: "+DEFAULT_SSL_PROTOCOL);
log.info("SSL session context: "+(SHARED_SESSION_CONTEXT ? "shared" : "per-thread"));
+ cps = JMeterUtils.getPropDefault("httpclient.socket.https.cps", 0); // $NON-NLS-1$
+
+ if (cps > 0) {
+ log.info("Setting up HTTPS SlowProtocol, cps="+cps);
+ }
+
}
/**
@@ -103,8 +111,9 @@
} else {
this.threadlocal = new ThreadLocal();
}
-
- HttpSSLProtocolSocketFactory sockFactory = new HttpSSLProtocolSocketFactory(this);
+
+ // TODO allow CPS to be passed from the sampler to allow per-sampler speed variations
+ HttpSSLProtocolSocketFactory sockFactory = new HttpSSLProtocolSocketFactory(this, cps);
HttpsURLConnection.setDefaultSSLSocketFactory(sockFactory);
HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org