jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1827461 - in /jmeter/trunk/xdocs: changes.xml usermanual/component_reference.xml
Date Thu, 22 Mar 2018 08:04:42 GMT
Author: pmouawad
Date: Thu Mar 22 08:04:42 2018
New Revision: 1827461

URL: http://svn.apache.org/viewvc?rev=1827461&view=rev
Log:
Bug 62211 - Fix HTTP Request Server Documentation
Bugzilla Id: 62211

Modified:
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1827461&r1=1827460&r2=1827461&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Mar 22 08:04:42 2018
@@ -179,6 +179,11 @@ this behaviour, set <code>httpclient.res
 <ul>
 </ul>
 
+<h3>Documentation</h3>
+<ul>
+    <li><bug>62211</bug>Fix HTTP Request Server Documentation. Contributed
by orimarko at gmail.com</li>
+</ul>
+
 <h3>General</h3>
 <ul>
   <li><bug>62107</bug>JMeter fails to start under Windows when <code>JM_LAUNCH</code>
contains spaces</li>

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1827461&r1=1827460&r2=1827461&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Thu Mar 22 08:04:42 2018
@@ -205,10 +205,16 @@ https.default.protocol=SSLv3
 
 <properties>
         <property name="Name" required="No">Descriptive name for this sampler that
is shown in the tree.</property>
-        <property name="Server" required="Yes, unless provided by HTTP Request Defaults">
-            Domain name or IP address of the web server, e.g. <code>www.example.com</code>.
[Do not include the <code>http://</code> prefix.]
-            Note: If the "<code>Host</code>" header is defined in a Header Manager,
then this will be used
-            as the virtual host name.
+        <property name="Server" required="No">
+             Domain name or IP address of the web server, e.g. <code>www.example.com</code>.
[Do not include the <code>http://</code> prefix.]
+             Note: If the "<code>Host</code>" header is defined in a Header Manager,
then this will be used
+             as the virtual host name.
+             <note>Server is required, unless:
+              <ul>
+                <li>it is provided by <complink name="HTTP Request Defaults"/></li>
+                <li>or a full URL including scheme, host and port (<code>scheme://host:port</code>)
is set in <b>Path</b> field</li>
+              </ul>
+             </note>
         </property>
         <property name="Port" required="No">Port the web server is listening to. Default:
<code>80</code></property>
         <property name="Connect Timeout" required="No">Connection Timeout. Number of
milliseconds to wait for a connection to open.</property>



Mime
View raw message