Author: pmouawad
Date: Fri Mar 25 12:20:30 2016
New Revision: 1736564
URL: http://svn.apache.org/viewvc?rev=1736564&view=rev
Log:
Reorganize
Modified:
jmeter/trunk/bin/jmeter.properties
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1736564&r1=1736563&r2=1736564&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Fri Mar 25 12:20:30 2016
@@ -371,21 +371,8 @@ log_level.jorphan=INFO
#http.java.sampler.retries=0
#---------------------------------------------------------------------------
-# Commons HTTPClient configuration
-#---------------------------------------------------------------------------
-
-# define a properties file for overriding Commons HttpClient parameters
-# See: http://hc.apache.org/httpclient-3.x/preference-api.html
-# Uncomment this line if you put anything in httpclient.parameters file
-#httpclient.parameters.file=httpclient.parameters
-
-
-# define a properties file for overriding Apache HttpClient parameters
-# See: TBA
-# Uncomment this line if you put anything in hc.parameters file
-#hc.parameters.file=hc.parameters
-
# Following properties apply to both Commons and Apache HttpClient
+#---------------------------------------------------------------------------
# set the socket timeout (or use the parameter http.socket.timeout)
# for AJP Sampler and HttpClient3 implementation.
@@ -435,7 +422,7 @@ log_level.jorphan=INFO
#log_file.httpclient=httpclient.log
-# Apache Commons HttpClient logging examples
+# Apache HttpClient logging examples
#
# Enable header wire + context logging - Best for Debugging
#log_level.org.apache.http=DEBUG
@@ -456,6 +443,10 @@ log_level.jorphan=INFO
# Apache HttpComponents HTTPClient configuration (HTTPClient4)
#---------------------------------------------------------------------------
+# define a properties file for overriding Apache HttpClient parameters
+# Uncomment this line if you put anything in hc.parameters file
+#hc.parameters.file=hc.parameters
+
# Number of retries to attempt (default 0)
#httpclient4.retrycount=0
@@ -471,10 +462,17 @@ log_level.jorphan=INFO
# TTL (in Milliseconds) represents an absolute value.
# No matter what the connection will not be re-used beyond its TTL.
#httpclient4.time_to_live=2000
+
#---------------------------------------------------------------------------
-# Apache HttpComponents HTTPClient configuration (HTTPClient 3.1)
+# Apache HttpComponents Commons HTTPClient configuration (HTTPClient 3.1)
+# DEPRECATED
#---------------------------------------------------------------------------
+# define a properties file for overriding Commons HttpClient parameters
+# See: http://hc.apache.org/httpclient-3.x/preference-api.html
+# Uncomment this line if you put anything in httpclient.parameters file
+#httpclient.parameters.file=httpclient.parameters
+
# Number of retries to attempt (default 0)
#httpclient3.retrycount=0
