Author: pmouawad
Date: Sat Mar 5 16:00:12 2016
New Revision: 1733731
URL: http://svn.apache.org/viewvc?rev=1733731&view=rev
Log:
Bug 59079 - "httpsampler.max_redirects" property is not enforced when "Redirect
Automatically" is used
Bugzilla Id: 59079
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1733731&r1=1733730&r2=1733731&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Sat Mar 5 16:00:12 2016
@@ -135,7 +135,7 @@ public class HTTPHC3Impl extends HTTPHCA
// Set default parameters as needed
HttpParams params = DefaultHttpParams.getDefaultParams();
-
+ params.setIntParameter("http.protocol.max-redirects",
HTTPSamplerBase.MAX_REDIRECTS); //$NON-NLS-1$
// Process Commons HttpClient parameters file
String file=JMeterUtils.getProperty("httpclient.parameters.file"); //
$NON-NLS-1$
if (file != null) {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1733731&r1=1733730&r2=1733731&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Sat Mar 5 16:00:12 2016
@@ -204,9 +204,10 @@ public class HTTPHC4Impl extends HTTPHCA
static {
log.info("HTTP request retry count = "+RETRY_COUNT);
-
+
DEFAULT_HTTP_PARAMS = new SyncBasicHttpParams(); // Could we drop the
Sync here?
DEFAULT_HTTP_PARAMS.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK,
false);
+ DEFAULT_HTTP_PARAMS.setIntParameter(ClientPNames.MAX_REDIRECTS,
HTTPSamplerBase.MAX_REDIRECTS);
DefaultHttpClient.setDefaultHttpParams(DEFAULT_HTTP_PARAMS);
// Process Apache HttpClient parameters file
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1733731&r1=1733730&r2=1733731&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Mar 5 16:00:12 2016
@@ -310,6 +310,7 @@ Summary
<li><bug>58950</bug>NoHttpResponseException when Pause between samplers
exceeds keepalive sent by server</li>
<li><bug>59085</bug>Http file panel : data lost on browse cancellation.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>56141</bug>Application does not behave correctly when using HTTP
Recorder. With the help of Dan (java.junkee at yahoo.com)</li>
+ <li><bug>59079</bug>"httpsampler.max_redirects" property is not enforced
when "Redirect Automatically" is used</li>
</ul>
<h3>Other Samplers</h3>
