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 ae9741ab9d19b4023e024fbc62867f77e436dc73
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/javax/servlet/resources/web-common_3_1.xsd | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
java/org/apache/catalina/filters/LocalStrings.properties | 4 ++--
java/org/apache/catalina/servlet4preview/http/PushBuilder.java | 4 ++--
java/org/apache/catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 4 ++--
java/org/apache/tomcat/util/http/parser/Host.java | 4 ++--
java/org/apache/tomcat/util/http/parser/MediaType.java | 2 +-
java/org/apache/tomcat/websocket/server/UpgradeUtil.java | 2 +-
test/org/apache/catalina/valves/rewrite/TestRewriteValve.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainerWithProxy.java | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/connectors.xml | 2 +-
webapps/docs/rewrite.xml | 6 +++---
webapps/docs/ssl-howto.xml | 8 ++++----
18 files changed, 28 insertions(+), 28 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/javax/servlet/resources/web-common_3_1.xsd
b/java/javax/servlet/resources/web-common_3_1.xsd
index fc0529b..c006c3b 100644
--- a/java/javax/servlet/resources/web-common_3_1.xsd
+++ b/java/javax/servlet/resources/web-common_3_1.xsd
@@ -566,7 +566,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 f5ac0fa..c32bd30 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -1063,7 +1063,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/servlet4preview/http/PushBuilder.java
b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
index 991d446..f5f6426 100644
--- a/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
+++ b/java/org/apache/catalina/servlet4preview/http/PushBuilder.java
@@ -84,7 +84,7 @@ public interface PushBuilder {
PushBuilder sessionId(String sessionId);
/**
- * Sets a HTTP header on the request. Any existing headers of the same name
+ * Sets an HTTP header on the request. Any existing headers of the same
name
* are first remove.
*
* @param name The name of the header to set
@@ -95,7 +95,7 @@ public interface PushBuilder {
PushBuilder setHeader(String name, String value);
/**
- * Adds a HTTP header to the request.
+ * Adds an HTTP header to the request.
*
* @param name The name of the header to add
* @param value The value of the header to add
diff --git a/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
b/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
index 2d5c208..4f9fd85 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/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 450877d..29f23d9 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -201,14 +201,14 @@ public class RewriteRule {
/**
* This forces the current URL to be forbidden, i.e., it immediately sends
- * back a HTTP response of 403 (FORBIDDEN). Use this flag in conjunction
+ * back an HTTP response of 403 (FORBIDDEN). Use this flag in conjunction
* with appropriate RewriteConds to conditionally block some URLs.
*/
protected boolean forbidden = false;
/**
* This forces the current URL to be gone, i.e., it immediately sends
- * back a HTTP response of 410 (GONE). Use this flag to mark pages which
+ * back an HTTP response of 410 (GONE). Use this flag to mark pages which
* no longer exist as gone.
*/
protected boolean gone = false;
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 1fdb9f6..a546ee6 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/util/http/parser/MediaType.java
b/java/org/apache/tomcat/util/http/parser/MediaType.java
index 9bacef2..b4b84ae 100644
--- a/java/org/apache/tomcat/util/http/parser/MediaType.java
+++ b/java/org/apache/tomcat/util/http/parser/MediaType.java
@@ -124,7 +124,7 @@ public class MediaType {
}
/**
- * Parses a MediaType value, either from a HTTP header or from an
application.
+ * Parses a MediaType value, either from an HTTP header or from an
application.
*
* @param input a reader over the header text
* @return a MediaType parsed from the input, or null if not valid
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index b1cf697..d522283 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -68,7 +68,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/catalina/valves/rewrite/TestRewriteValve.java
b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
index 8e2e3f2..29c2961 100644
--- a/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
+++ b/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
/*
* Implementation note:
*
- * A number of these tests involve the rewrite valve returning a HTTP Location
+ * A number of these tests involve the rewrite valve returning an HTTP Location
* header that include un-encoded UTF-8 bytes. How the HTTP client handles
these
* depends on the default character encoding configured for the JVM running the
* test. The tests expect the client to be configured with UTF-8 as the default
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 ae99ed3..d930ae2 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 3848d34..c449e6c 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/rewrite.xml b/webapps/docs/rewrite.xml
index 645f4f2..4e2160e 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -591,7 +591,7 @@ cannot use <code>$N</code> in the substitution string!
<li>'<strong><code>forbidden|F</code></strong>' (force URL
to be <strong>f</strong>orbidden)<br />
This forces the current URL to be forbidden - it immediately
- sends back a HTTP response of 403 (FORBIDDEN).
+ sends back an HTTP response of 403 (FORBIDDEN).
Use this flag in conjunction with
appropriate RewriteConds to conditionally block some
URLs.</li>
@@ -599,7 +599,7 @@ cannot use <code>$N</code> in the substitution string!
<li>'<strong><code>gone|G</code></strong>' (force URL to be
<strong>g</strong>one)<br />
This forces the current URL to be gone - it
- immediately sends back a HTTP response of 410 (GONE). Use
+ immediately sends back an HTTP response of 410 (GONE). Use
this flag to mark pages which no longer exist as gone.</li>
<li>
@@ -691,7 +691,7 @@ cannot use <code>$N</code> in the substitution string!
Prefix <em>Substitution</em> with
<code>http://thishost[:thisport]/</code> (which makes the
new URL a URI) to force a external redirection. If no
- <em>code</em> is given, a HTTP response of 302 (FOUND, previously
MOVED
+ <em>code</em> is given, an HTTP response of 302 (FOUND, previously
MOVED
TEMPORARILY) will be returned. If you want to use other response
codes in the range 300-399, simply specify the appropriate number
or use one of the following symbolic names:
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 7dff058..dfa5fdf 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -277,12 +277,12 @@ 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"
sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation"
port="8443" .../>
-<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO2 implementation -->
+<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO2 implementation -->
<Connector protocol="org.apache.coyote.http11.Http11Nio2Protocol"
sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation"
port="8443" .../>]]></source>
@@ -293,13 +293,13 @@ allows enabling it. When using the OpenSSL JSSE
implementation, the configuratio
either the JSSE attributes or
the OpenSSL attributes (as used for the APR connector), but must not mix
attributes from
both types in the same SSLHostConfig or Connector element.</p>
-<source><![CDATA[<!-- Define a HTTP/1.1 Connector on port 8443, JSSE NIO
implementation and OpenSSL -->
+<source><![CDATA[<!-- Define an HTTP/1.1 Connector on port 8443, JSSE NIO
implementation and OpenSSL -->
<Connector protocol="org.apache.coyote.http11.Http11NioProtocol" port="8443"
sslImplementationName="org.apache.tomcat.util.net.openssl.OpenSSLImplementation"
.../>]]></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
