Author: sebb
Date: Sat Mar 17 12:56:51 2007
New Revision: 519432
URL: http://svn.apache.org/viewvc?view=rev&rev=519432
Log:
Add temporary override for https protocol: https.default.protocol
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=519432&r1=519431&r2=519432
==============================================================================
---
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
Sat Mar 17 12:56:51 2007
@@ -61,6 +61,10 @@
private static final String HTTPS = "https"; // $NON-NLS-1$
+ // Temporary fix to allow default protocol to be changed
+ private static final String DEFAULT_SSL_PROTOCOL =
+ JMeterUtils.getPropDefault("https.default.protocol","TLS"); //
$NON-NLS-1$ // $NON-NLS-2$
+
/**
* Cache the SecureRandom instance because it takes a long time to
create
*/
@@ -134,9 +138,9 @@
if (null == this.context) {
try {
if (pro != null) {
- this.context =
SSLContext.getInstance("TLS", pro); // $NON-NLS-1$
+ this.context =
SSLContext.getInstance(DEFAULT_SSL_PROTOCOL, pro); // $NON-NLS-1$
} else {
- this.context =
SSLContext.getInstance("TLS"); // $NON-NLS-1$
+ this.context =
SSLContext.getInstance(DEFAULT_SSL_PROTOCOL); // $NON-NLS-1$
}
log.debug("SSL context = " + context);
} catch (Exception ee) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
