You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/18 23:47:26 UTC

svn commit: r1783601 - /jmeter/trunk/xdocs/usermanual/properties_reference.xml

Author: pmouawad
Date: Sat Feb 18 23:47:26 2017
New Revision: 1783601

URL: http://svn.apache.org/viewvc?rev=1783601&view=rev
Log:
Update docs after drop of commons-httpclient-3.1

Modified:
    jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1783601&r1=1783600&r2=1783601&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Feb 18 23:47:26 2017
@@ -356,8 +356,6 @@ JMETER-SERVER</source>
 <property name="httpclient.timeout">
     Set the socket timeout (or use the parameter <code>http.socket.timeout</code>) for
     AJP Sampler and HttpClient3 implementation.<br/>
-    <note>Note for HttpClient3 implementation it is better to use GUI to set timeout or
-    use <code>http.socket.timeout</code> in <code>httpclient.parameters</code>.</note>
     Value is in milliseconds, <code>0</code> means no timeout.<br/>
     Defaults to: <code>0</code>
 </property>
@@ -689,8 +687,7 @@ JMETER-SERVER</source>
     <dl>
         <dt><code>HTTPSampler</code> or <code>Java</code></dt>
         <dd>Use the <code>Java</code> Sampler</dd>
-        <dt><code>HTTPSampler2</code> or <code>HttpClient3.1</code></dt>
-        <dd>Use Apache HTTPClient version 3.1</dd>
+        <dt><code>HTTPSampler2</code></dt>
         <dt><code>HttpClient4</code></dt>
         <dd>Use Apache HTTPClient version 4</dd>
     </dl>