This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0263a8397c540969ba6f3a4e91612821d41cc7c6
Author: KangZhiDong <world...@gmail.com>
AuthorDate: Wed Sep 4 22:48:23 2019 +0800
fix typo (an ssl)
---
conf/server.xml | 4 ++--
java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
java/org/apache/catalina/startup/CertificateCreateRule.java | 2 +-
java/org/apache/tomcat/jni/SSL.java | 6 +++---
java/org/apache/tomcat/jni/SSLConf.java | 2 +-
java/org/apache/tomcat/jni/SSLContext.java | 6 +++---
java/org/apache/tomcat/jni/SSLSocket.java | 6 +++---
java/org/apache/tomcat/util/net/Nio2Channel.java | 2 +-
java/org/apache/tomcat/util/net/NioChannel.java | 2 +-
java/org/apache/tomcat/util/net/SecureNio2Channel.java | 2 +-
java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +-
webapps/docs/changelog.xml | 2 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/http.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 ++--
15 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/conf/server.xml b/conf/server.xml
index fce8922..2cd78df 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -76,7 +76,7 @@
connectionTimeout="20000"
redirectPort="8443" />
-->
- <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation. The default
SSLImplementation will depend on the presence of the APR/native
library and the useOpenSSL attribute of the
@@ -93,7 +93,7 @@
</SSLHostConfig>
</Connector>
-->
- <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+ <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
This connector uses the APR/native implementation which always uses
OpenSSL for TLS.
Either JSSE or OpenSSL style configuration may be used. OpenSSL style
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties
b/java/org/apache/catalina/realm/LocalStrings.properties
index ba0de03..ffffe7d 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -64,7 +64,7 @@ jndiRealm.exception=Exception performing authentication
jndiRealm.exception.retry=Exception performing authentication. Retrying...
jndiRealm.invalidHostnameVerifier=[{0}] not a valid class name for a
HostnameVerifier
jndiRealm.invalidSslProtocol=Given protocol [{0}] is invalid. It has to be one
of [{1}]
-jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for a
SSLSocketFactory
+jndiRealm.invalidSslSocketFactory=[{0}] not a valid class name for an
SSLSocketFactory
jndiRealm.negotiatedTls=Negotiated tls connection using protocol [{0}]
jndiRealm.open=Exception opening directory server connection
jndiRealm.tlsClose=Exception closing tls response
diff --git a/java/org/apache/catalina/startup/CertificateCreateRule.java
b/java/org/apache/catalina/startup/CertificateCreateRule.java
index 6e49e19..1db3c70 100644
--- a/java/org/apache/catalina/startup/CertificateCreateRule.java
+++ b/java/org/apache/catalina/startup/CertificateCreateRule.java
@@ -23,7 +23,7 @@ import
org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.xml.sax.Attributes;
/**
- * Rule implementation that creates a SSLHostConfigCertificate.
+ * Rule implementation that creates an SSLHostConfigCertificate.
*/
public class CertificateCreateRule extends Rule {
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 6c3f2b4..06b6090 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -140,7 +140,7 @@ public final class SSL {
/* Set on servers to choose the cipher according to the server's
* preferences */
public static final int SSL_OP_CIPHER_SERVER_PREFERENCE =
0x00400000;
- /* If set, a server will allow a client to issue a SSLv3.0 version number
+ /* If set, a server will allow a client to issue an SSLv3.0 version number
* as latest version supported in the premaster secret, even when TLSv1.0
* (version 3.1) was announced in the client hello. Normally this is
* forbidden to prevent version rollback attacks. */
@@ -647,7 +647,7 @@ public final class SSL {
* Authentication. Notice that this directive can be used both in
per-server
* and per-directory context. In per-server context it applies to the
client
* authentication process used in the standard SSL handshake when a
connection
- * is established. In per-directory context it forces a SSL renegotiation
with
+ * is established. In per-directory context it forces an SSL renegotiation
with
* the reconfigured client verification level after the HTTP request was
read
* but before the HTTP response is sent.
* <br>
@@ -704,7 +704,7 @@ public final class SSL {
* is permitted to negotiate in the SSL handshake phase. Notice that this
* directive can be used both in per-server and per-directory context.
* In per-server context it applies to the standard SSL handshake when a
- * connection is established. In per-directory context it forces a SSL
+ * connection is established. In per-directory context it forces an SSL
* renegotiation with the reconfigured Cipher Suite after the HTTP request
* was read but before the HTTP response is sent.
* @param ssl the SSL instance (SSL *)
diff --git a/java/org/apache/tomcat/jni/SSLConf.java
b/java/org/apache/tomcat/jni/SSLConf.java
index 272c0a1..ede4565 100644
--- a/java/org/apache/tomcat/jni/SSLConf.java
+++ b/java/org/apache/tomcat/jni/SSLConf.java
@@ -73,7 +73,7 @@ public final class SSLConf {
public static native int check(long cctx, String name, String value)
throws Exception;
/**
- * Assign an SSL context to a SSL_CONF context.
+ * Assign an SSL context to an SSL_CONF context.
* All following calls to {@link #apply(long, String, String)} will be
* applied to this SSL context.
*
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index 45fcc48..e0759b3 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -126,7 +126,7 @@ public final class SSLContext {
* <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
* <b>mode</b> valid at the time and may be 0 or 1.
* <br>
- * Normally when a SSL connection is finished, the parties must send out
+ * Normally when an SSL connection is finished, the parties must send out
* "close notify" alert messages using
L<SSL_shutdown(3)|SSL_shutdown(3)>
* for a clean shutdown.
* <br>
@@ -150,7 +150,7 @@ public final class SSLContext {
* is permitted to negotiate in the SSL handshake phase. Notice that this
* directive can be used both in per-server and per-directory context.
* In per-server context it applies to the standard SSL handshake when a
- * connection is established. In per-directory context it forces a SSL
+ * connection is established. In per-directory context it forces an SSL
* renegotiation with the reconfigured Cipher Suite after the HTTP request
* was read but before the HTTP response is sent.
* @param ctx Server or Client context to use.
@@ -368,7 +368,7 @@ public final class SSLContext {
* Authentication. Notice that this directive can be used both in
per-server
* and per-directory context. In per-server context it applies to the
client
* authentication process used in the standard SSL handshake when a
connection
- * is established. In per-directory context it forces a SSL renegotiation
with
+ * is established. In per-directory context it forces an SSL renegotiation
with
* the reconfigured client verification level after the HTTP request was
read
* but before the HTTP response is sent.
* <br>
diff --git a/java/org/apache/tomcat/jni/SSLSocket.java
b/java/org/apache/tomcat/jni/SSLSocket.java
index c8108a0..2cc42f7 100644
--- a/java/org/apache/tomcat/jni/SSLSocket.java
+++ b/java/org/apache/tomcat/jni/SSLSocket.java
@@ -24,7 +24,7 @@ package org.apache.tomcat.jni;
public class SSLSocket {
/**
- * Attach APR socket on a SSL connection.
+ * Attach APR socket on an SSL connection.
* @param ctx SSLContext to use.
* @param sock APR Socket that already did physical connect or accept.
* @return APR_STATUS code.
@@ -34,14 +34,14 @@ public class SSLSocket {
throws Exception;
/**
- * Do a SSL handshake.
+ * Do an SSL handshake.
* @param thesocket The socket to use
* @return the handshake status
*/
public static native int handshake(long thesocket);
/**
- * Do a SSL renegotiation.
+ * Do an SSL renegotiation.
* SSL supports per-directory re-configuration of SSL parameters.
* This is implemented by performing an SSL renegotiation of the
* re-configured parameters after the request is read, but before the
diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java
b/java/org/apache/tomcat/util/net/Nio2Channel.java
index 3437ed0..bc5a8b3 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeoutException;
/**
* Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
+ * This way, logic for an SSL socket channel remains the same as for
* a non SSL, making sure we don't need to code for any exception cases.
*/
public class Nio2Channel implements AsynchronousByteChannel {
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java
b/java/org/apache/tomcat/util/net/NioChannel.java
index bfe6f07..29e2c2a 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -28,7 +28,7 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
+ * This way, logic for an SSL socket channel remains the same as for
* a non SSL, making sure we don't need to code for any exception cases.
*
* @version 1.0
diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
index c352143..11f31a0 100644
--- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java
+++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java
@@ -563,7 +563,7 @@ public class SecureNio2Channel extends Nio2Channel {
}
/**
- * Sends a SSL close message, will not physically close the connection
here.<br>
+ * Sends an SSL close message, will not physically close the connection
here.<br>
* To close the connection, you could do something like
* <pre><code>
* close();
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index dc8c5a0..d972492 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -503,7 +503,7 @@ public class SecureNioChannel extends NioChannel {
}
/**
- * Sends a SSL close message, will not physically close the connection
here.
+ * Sends an SSL close message, will not physically close the connection
here.
* <br>To close the connection, you could do something like
* <pre><code>
* close();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6cec550..38b2241 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -2658,7 +2658,7 @@
mechanism. (markt)
</fix>
<fix>
- <bug>61914</bug>: Possible NPE with Java 9 when creating a SSL engine.
+ <bug>61914</bug>: Possible NPE with Java 9 when creating an SSL engine.
Patch submitted by Evgenij Ryazanov. (remm)
</fix>
<fix>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 45bd7bd..bc63c89 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -232,7 +232,7 @@
calls to <code>request.isSecure()</code> to return <code>true</code>
for requests received by this Connector. You would want this on an
SSL Connector or a non SSL connector that is receiving data from a
- SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+ SSL accelerator, like a crypto card, an SSL appliance or even a
webserver.
The default value is <code>false</code>.</p>
</attribute>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 14c0cae..2ae9b6e 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -232,7 +232,7 @@
calls to <code>request.isSecure()</code> to return <code>true</code>
for requests received by this Connector. You would want this on an
SSL Connector or a non SSL connector that is receiving data from a
- SSL accelerator, like a crypto card, a SSL appliance or even a webserver.
+ SSL accelerator, like a crypto card, an SSL appliance or even a
webserver.
The default value is <code>false</code>.</p>
</attribute>
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index dfa5fdf..91b5dd2 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -333,7 +333,7 @@ for an SSL connector is included in the default
<code>server.xml</code>
file installed with Tomcat. To configure an SSL connector that uses JSSE, you
will need to remove the comments and edit it so it looks something like
this:</p>
-<source><