Author: pmouawad
Date: Tue Dec 18 15:47:53 2018
New Revision: 1849187
URL: http://svn.apache.org/viewvc?rev=1849187&view=rev
Log:
Bug 62829 - Allow specifying Proxy server scheme for HTTP request sampler,
Advanced tab and command line option
Fix error if scheme is empty
Bugzilla Id: 62829
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java?rev=1849187&r1=1849186&r2=1849187&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
Tue Dec 18 15:47:53 2018
@@ -43,7 +43,7 @@ public abstract class HTTPHCAbstractImpl
private static final Logger log =
LoggerFactory.getLogger(HTTPHCAbstractImpl.class);
- protected static final String PROXY_SCHEME =
System.getProperty("http.proxyScheme","");
+ protected static final String PROXY_SCHEME =
System.getProperty("http.proxyScheme","http");
protected static final String PROXY_HOST =
System.getProperty("http.proxyHost","");
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1849187&r1=1849186&r2=1849187&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Tue Dec 18 15:47:53 2018
@@ -828,7 +828,7 @@ public abstract class HTTPSamplerBase ex
}
public String getProxyScheme() {
- return getPropertyAsString(PROXYSCHEME);
+ return getPropertyAsString(PROXYSCHEME,
HTTPHCAbstractImpl.PROXY_SCHEME);
}
public String getProxyHost() {
