You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2020/11/28 11:05:21 UTC

[jmeter] branch master updated: Add documentation for the system properties http.proxyUser/proxyPass

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 305ce7c  Add documentation for the system properties http.proxyUser/proxyPass
305ce7c is described below

commit 305ce7c28f7c4a46fcd2db55679948009fec248a
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Nov 28 12:05:01 2020 +0100

    Add documentation for the system properties http.proxyUser/proxyPass
---
 xdocs/usermanual/get-started.xml          | 7 +++++++
 xdocs/usermanual/properties_reference.xml | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 5ead9ff..1265d83 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -425,7 +425,14 @@ If the proxy host and port are provided, then JMeter sets the following System p
 <li><code>https.proxyHost</code></li>
 <li><code>https.proxyPort</code></li>
 </ul>
+<p>
+The user and password used for a proxy can be given by the System properties <code>http.proxyUser</code>
+and <code>http.proxyUser</code>. They will get overridden by the above arguments or values set in the
+HTTP Samplers.
+</p>
+<p>
 If a nonproxy host list is provided, then JMeter sets the following System properties:
+</p>
 <ul>
 <li><code>http.nonProxyHosts</code></li>
 <li><code>https.nonProxyHosts</code></li>
diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml
index d90f0c3..21174b4 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -465,6 +465,12 @@ JMETER-SERVER</source>
     Define the local host address to be used for multi-homed hosts,
     example <source>httpclient.localaddress=1.2.3.4</source>
 </property>
+<property name="http.proxyUser">
+    Set the user name to use with a proxy.
+</property>
+<property name="http.proxyPass">
+    Set the password to use with a proxy.
+</property>
 </properties>
 </section>
 <section name="&sect-num;.11 Kerberos properties" anchor="kerberos">