This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fcca9621a8a36fba31a9dedad5602966c8e65e6e
Author: KangZhiDong <world...@gmail.com>
AuthorDate: Wed Sep 4 22:48:23 2019 +0800
fix typo (an ssl)
---
conf/server.xml | 2 +-
java/org/apache/catalina/realm/LocalStrings.properties | 2 +-
java/org/apache/tomcat/jni/SSL.java | 2 +-
java/org/apache/tomcat/jni/SSLContext.java | 6 +++---
java/org/apache/tomcat/jni/SSLSocket.java | 6 +++---
java/org/apache/tomcat/util/net/NioChannel.java | 2 +-
java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/http.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 ++--
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/conf/server.xml b/conf/server.xml
index df638a3..502858c 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -78,7 +78,7 @@
connectionTimeout="20000"
redirectPort="8443" />
-->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ <!-- Define an SSL HTTP/1.1 Connector on port 8443
This connector uses the BIO implementation that requires the JSSE
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
diff --git a/java/org/apache/catalina/realm/LocalStrings.properties
b/java/org/apache/catalina/realm/LocalStrings.properties
index 8925f2a..7e7e49b 100644
--- a/java/org/apache/catalina/realm/LocalStrings.properties
+++ b/java/org/apache/catalina/realm/LocalStrings.properties
@@ -76,7 +76,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/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 0baa0ef..366acd7 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -130,7 +130,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. */
diff --git a/java/org/apache/tomcat/jni/SSLContext.java
b/java/org/apache/tomcat/jni/SSLContext.java
index e8be0c6..9335159 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -107,7 +107,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>
@@ -131,7 +131,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.
@@ -276,7 +276,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 7a9b237..e21d566 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/NioChannel.java
b/java/org/apache/tomcat/util/net/NioChannel.java
index 64056ba..74d056c 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -32,7 +32,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.
*
* @author Filip Hanik
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 24884d1e..84e51bb 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -381,7 +381,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/config/ajp.xml b/webapps/docs/config/ajp.xml
index 32a9474..8d6a01b 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 c947d40..880a255 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -220,7 +220,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 3680718..f895928 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -301,7 +301,7 @@ 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>
-<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 -->
<Connector
protocol="org.apache.coyote.http11.Http11NioProtocol"
port="8443" maxThreads="200"
@@ -313,7 +313,7 @@ this:</p>
The APR connector uses different attributes for many SSL settings,
particularly keys and certificates. An example of an APR configuration is:
<source>
-<!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+<!-- Define an SSL Coyote HTTP/1.1 Connector on port 8443 -->
<Connector
protocol="org.apache.coyote.http11.Http11AprProtocol"
port="8443" maxThreads="200"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
