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:21:31 UTC
svn commit: r546524 -
/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Author: sebb
Date: Tue Jun 12 08:21:30 2007
New Revision: 546524
URL: http://svn.apache.org/viewvc?view=rev&rev=546524
Log:
Slow SSL sockets have to be done elsewhere
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?view=diff&rev=546524&r1=546523&r2=546524
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java Tue Jun 12 08:21:30 2007
@@ -159,14 +159,16 @@
Protocol.registerProtocol(PROTOCOL_HTTP,
new Protocol(PROTOCOL_HTTP,new SlowHttpClientSocketFactory(cps),DEFAULT_HTTP_PORT));
}
- cps =
- JMeterUtils.getPropDefault("httpclient.socket.https.cps", 0); // $NON-NLS-1$
-
- if (cps > 0) {
- log.info("Setting up HTTPS SlowProtocol, cps="+cps);
- Protocol.registerProtocol(PROTOCOL_HTTPS,
- new Protocol(PROTOCOL_HTTPS,new SlowHttpClientSocketFactory(cps),DEFAULT_HTTPS_PORT));
- }
+
+ // Now done in JsseSSLManager (which needs to register the protocol)
+// cps =
+// JMeterUtils.getPropDefault("httpclient.socket.https.cps", 0); // $NON-NLS-1$
+//
+// if (cps > 0) {
+// log.info("Setting up HTTPS SlowProtocol, cps="+cps);
+// Protocol.registerProtocol(PROTOCOL_HTTPS,
+// new Protocol(PROTOCOL_HTTPS,new SlowHttpClientSocketFactory(cps),DEFAULT_HTTPS_PORT));
+// }
String localHostOrIP =
JMeterUtils.getPropDefault("httpclient.localaddress",""); // $NON-NLS-1$
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org