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 174ba3178f Fixed grammar
174ba3178f is described below
commit 174ba3178f287d2984b1e53004e2c2cee1ffff16
Author: David Coomber <[email protected]>
AuthorDate: Sun Jun 23 12:53:21 2024 +0200
Fixed grammar
---
src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java | 4 ++--
xdocs/usermanual/component_reference.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index e09387dfeb..cf184c04a1 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -53,7 +53,7 @@ public class KeyToolUtils {
/** Name of property that can be used to override the default keytool
location */
private static final String KEYTOOL_DIRECTORY = "keytool.directory"; //
$NON-NLS-1$
- private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter
Intermediate CA for recording (INSTALL ONLY IF ITS YOURS)"; // $NON-NLS-1$
+ private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter
Intermediate CA for recording (INSTALL ONLY IF IT IS YOURS)"; // $NON-NLS-1$
public static final String ROOT_CACERT_CRT_PFX =
"ApacheJMeterTemporaryRootCA"; // $NON-NLS-1$ (do not change)
private static final String ROOT_CACERT_CRT = ROOT_CACERT_CRT_PFX +
".crt"; // $NON-NLS-1$ (Firefox and Windows)
@@ -73,7 +73,7 @@ public class KeyToolUtils {
static {
StringBuilder sb = new StringBuilder();
- sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF ITS
YOURS)"); // $NON-NLS-1$
+ sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)"); // $NON-NLS-1$
String userName = System.getProperty("user.name"); // $NON-NLS-1$
userName = userName.replace('\\','/'); // Backslash is special
(Bugzilla 56178)
addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
diff --git a/xdocs/usermanual/component_reference.xml
b/xdocs/usermanual/component_reference.xml
index bafe02dbd2..5733903554 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6832,9 +6832,9 @@ As a consequence:
<li>The browser should display a dialogue asking if you want to accept the
certificate or not. For example:
<source>
1) The server's name "<code>www.example.com</code>" does not match the
certificate's name
- "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>".
Somebody may be trying to eavesdrop on you.
-2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF
ITS YOURS)</code>" is signed by the unknown Certificate Authority
- "<code>_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)</code>".
It is not possible to verify that this is a valid certificate.
+ "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)</code>". Somebody may be trying to eavesdrop on you.
+2) The certificate for "<code>_ JMeter Root CA for recording (INSTALL ONLY IF
IT IS YOURS)</code>" is signed by the unknown Certificate Authority
+ "<code>_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)</code>". It is not possible to verify that this is a valid certificate.
</source>
You will need to accept the certificate in order to allow the JMeter Proxy to
intercept the SSL traffic in order to
record it.
