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 71aa3a90f8cf3e0ac9ed318ac78919fcc309c0ac
Author: KangZhiDong <world...@gmail.com>
AuthorDate: Sun Sep 1 04:21:45 2019 +0800
fix typo
---
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/javax/servlet/resources/web-common_3_0.xsd | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
java/org/apache/catalina/filters/LocalStrings.properties | 4 ++--
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++--
java/org/apache/tomcat/util/http/parser/Host.java | 4 ++--
java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +-
.../apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 ++--
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/java/javax/servlet/resources/web-app_2_5.xsd
b/java/javax/servlet/resources/web-app_2_5.xsd
index f01830f..72a0f6a 100644
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
<xsd:simpleType name="http-methodType">
<xsd:annotation>
<xsd:documentation>
- A HTTP method type as defined in HTTP 1.1 section 2.2.
+ An HTTP method type as defined in HTTP 1.1 section 2.2.
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd
b/java/javax/servlet/resources/web-common_3_0.xsd
index 8382e3e..6d5d875 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -593,7 +593,7 @@
<xsd:annotation>
<xsd:documentation>
- A HTTP method type as defined in HTTP 1.1 section 2.2.
+ An HTTP method type as defined in HTTP 1.1 section 2.2.
</xsd:documentation>
</xsd:annotation>
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 3ba0141..308c1b4 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1080,7 +1080,7 @@ public class CorsFilter implements Filter {
*/
SIMPLE,
/**
- * A HTTP request that needs to be pre-flighted.
+ * An HTTP request that needs to be pre-flighted.
*/
ACTUAL,
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index 3f2b136..649fde6 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -20,8 +20,8 @@ corsFilter.invalidSupportsCredentials=It is not allowed to
configure supportsCre
corsFilter.nullRequest=HttpServletRequest object is null
corsFilter.nullRequestType=CORSRequestType object is null
corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
-corsFilter.wrongType1=Expects a HttpServletRequest object of type [{0}]
-corsFilter.wrongType2=Expects a HttpServletRequest object of type [{0}] or
[{1}]
+corsFilter.wrongType1=Expects an HttpServletRequest object of type [{0}]
+corsFilter.wrongType2=Expects an HttpServletRequest object of type [{0}] or
[{1}]
csrfPrevention.invalidRandomClass=Unable to create Random source using class
[{0}]
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 129df92..e06407d 100644
--- a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
+++ b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.tomcat.util.ExceptionUtils;
/**
- * A HttpServletResponseWrapper, used from
+ * An HttpServletResponseWrapper, used from
* <code>SSIServletExternalResolver</code>
*
* @author Bip Thelin
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 11e7f31..3398d51 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -145,7 +145,7 @@ public final class FastHttpDateFormat {
/**
- * Try to parse the given date as a HTTP date.
+ * Try to parse the given date as an HTTP date.
* @param value The HTTP date
* @param threadLocalformats Ignored. The local array of
* ConcurrentDateFormat will always be used.
@@ -161,7 +161,7 @@ public final class FastHttpDateFormat {
/**
- * Try to parse the given date as a HTTP date.
+ * Try to parse the given date as an HTTP date.
* @param value The HTTP date
* @return the date as a long or <code>-1</code> if the value cannot be
* parsed
diff --git a/java/org/apache/tomcat/util/http/parser/Host.java
b/java/org/apache/tomcat/util/http/parser/Host.java
index 1400de1..b774ef2 100644
--- a/java/org/apache/tomcat/util/http/parser/Host.java
+++ b/java/org/apache/tomcat/util/http/parser/Host.java
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.buf.MessageBytes;
public class Host {
/**
- * Parse the given input as a HTTP Host header value.
+ * Parse the given input as an HTTP Host header value.
*
* @param mb The host header value
*
@@ -42,7 +42,7 @@ public class Host {
/**
- * Parse the given input as a HTTP Host header value.
+ * Parse the given input as an HTTP Host header value.
*
* @param string The host header value
*
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index 36dfbc5..04d713e 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -70,7 +70,7 @@ public class UpgradeUtil {
* @param request The request to check if it is an HTTP upgrade request
for
* a WebSocket connection
* @param response The response associated with the request
- * @return <code>true</code> if the request includes a HTTP Upgrade request
+ * @return <code>true</code> if the request includes an HTTP Upgrade
request
* for the WebSocket protocol, otherwise <code>false</code>
*/
public static boolean isWebSocketUpgradeRequest(ServletRequest request,
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index a269b6e..e1d5535 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -25,7 +25,7 @@ public class TestWsWebSocketContainerWithProxy extends
TestWsWebSocketContainer
@BeforeClass
public static void init() {
- // Set the system properties for a HTTP proxy on 192.168.0.100:80
+ // Set the system properties for an HTTP proxy on 192.168.0.100:80
// I used an httpd instance configured as an open forward proxy for
this
// Update the IP/hostname as required
System.setProperty("http.proxyHost", "192.168.0.100");
diff --git a/webapps/docs/config/cluster-valve.xml
b/webapps/docs/config/cluster-valve.xml
index deee3d8..043bc6b 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -46,7 +46,7 @@
</section>
<section name="org.apache.catalina.ha.tcp.ReplicationValve">
- The <code>ReplicationValve</code> will notify the cluster at the end of a
HTTP request
+ The <code>ReplicationValve</code> will notify the cluster at the end of an
HTTP request
so that the cluster can make a decision whether there is data to be
replicated or not.
<subsection name="Attributes">
<attributes>
diff --git a/webapps/docs/connectors.xml b/webapps/docs/connectors.xml
index be443d9..fe297a1 100644
--- a/webapps/docs/connectors.xml
+++ b/webapps/docs/connectors.xml
@@ -46,7 +46,7 @@ hopefully help you make the right choice according to your
needs.</p>
<p>The HTTP connector is setup by default with Tomcat, and is ready to use.
This
connector features the lowest latency and best overall performance.</p>
-<p>For clustering, a HTTP load balancer <b>with support for web sessions
stickiness</b>
+<p>For clustering, an HTTP load balancer <b>with support for web sessions
stickiness</b>
must be installed to direct the traffic to the Tomcat servers. Tomcat supports
mod_proxy
(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2)
as the load balancer.
It should be noted that the performance of HTTP proxying is usually lower than
the
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 6e26045..3680718 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -259,7 +259,7 @@ in the <b>protocol</b> attribute of the <a
href="config/http.html">Connector</a>
<p>To define a Java (JSSE) connector, regardless of whether the APR library is
loaded or not, use one of the following:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO
implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO
implementation -->
<Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
port="8443" .../>
@@ -267,7 +267,7 @@ loaded or not, use one of the following:</p>
<Connector protocol="org.apache.coyote.http11.Http11Protocol"
port="8443" .../>]]></source>
<p>Alternatively, to specify an APR connector (the APR library must be
available) use:</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, APR
implementation -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, APR
implementation -->
<Connector protocol="org.apache.coyote.http11.Http11AprProtocol"
port="8443" .../>]]></source>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
