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 2005/06/12 00:46:49 UTC
cvs commit: jakarta-jmeter/bin jmeter.properties
sebb 2005/06/11 15:46:49
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSamplerBase.java
bin jmeter.properties
Log:
Bug 35281 - allow max redirects to be overriden by a property
Revision Changes Path
1.12 +5 -2 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Index: HTTPSamplerBase.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HTTPSamplerBase.java 25 May 2005 14:16:06 -0000 1.11
+++ HTTPSamplerBase.java 11 Jun 2005 22:46:49 -0000 1.12
@@ -42,6 +42,7 @@
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -597,9 +598,11 @@
return path;
}
- protected static final int MAX_REDIRECTS = 5;
+ protected static final int MAX_REDIRECTS =
+ JMeterUtils.getPropDefault("httpsampler.max_redirects",5);
- protected static final int MAX_FRAME_DEPTH = 5;
+ protected static final int MAX_FRAME_DEPTH =
+ JMeterUtils.getPropDefault("httpsampler.max_frame_depth",5);
/*
* (non-Javadoc)
1.120 +8 -3 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- jmeter.properties 14 May 2005 23:31:53 -0000 1.119
+++ jmeter.properties 11 Jun 2005 22:46:49 -0000 1.120
@@ -29,7 +29,7 @@
# Save test plans and test logs in 2.0 format
#file_format=2.0
# Just test plans (jmx)
-#file_format.testplan=2.0
+file_format.testplan=2.0
# Just test logs (jtl)
#file_format.testlog=2.0
@@ -251,6 +251,11 @@
#htmlParser.className=org.apache.jmeter.protocol.http.parser.JTidyHTMLParser
#htmlParser.className=org.apache.jmeter.protocol.http.parser.RegexpHTMLParser
+# Maximum redirects to follow in a single sequence (default 5)
+#httpsampler.max_redirects=5
+# Maximum frame/iframe nesting depth (default 5)
+#httpsampler.max_frame_depth=5
+
# Put the start time stamp in logs instead of the end
#sampleresult.timestamp.start=true
@@ -351,4 +356,4 @@
# the controllers are initialised. This is so controllers can access variables earlier.
# In case this causes problems, the previous behaviour can be restored by uncommenting
# the following line.
-#jmeterthread.startearlier=false
\ No newline at end of file
+#jmeterthread.startearlier=false
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org