This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b1506d7 Fix case of HTML and SHTML
b1506d7 is described below
commit b1506d76be60b2a8432adb648d101b608a6e57c5
Author: John Bampton <[email protected]>
AuthorDate: Wed Sep 16 00:18:29 2020 +1000
Fix case of HTML and SHTML
(cherry picked from commit 51b429836590b39d1c8a8ba5b55a4edd79f105b8)
---
java/org/apache/catalina/filters/ExpiresFilter.java | 4 ++--
java/org/apache/catalina/ssi/SSIFilter.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 8 ++++----
test/org/apache/catalina/startup/SimpleHttpClient.java | 2 +-
test/org/apache/catalina/startup/TesterServletEncodeUrl.java | 2 +-
webapps/examples/WEB-INF/classes/RequestInfoExample.java | 2 +-
webapps/examples/WEB-INF/classes/RequestParamExample.java | 2 +-
webapps/examples/WEB-INF/classes/SessionExample.java | 2 +-
webapps/examples/jsp/cal/cal1.jsp | 2 +-
webapps/examples/jsp/cal/login.html | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 0b9fcd4..213c4f9 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -518,8 +518,8 @@ public class ExpiresFilter extends FilterBase {
/**
* Expiration configuration starting point. Either the time the
- * html-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
- * or the last time the html-page/servlet-response was modified (
+ * HTML-page/servlet-response was served ({@link
StartingPoint#ACCESS_TIME})
+ * or the last time the HTML-page/servlet-response was modified (
* {@link StartingPoint#LAST_MODIFICATION_TIME}).
*/
protected enum StartingPoint {
diff --git a/java/org/apache/catalina/ssi/SSIFilter.java
b/java/org/apache/catalina/ssi/SSIFilter.java
index c02a273..737b46b 100644
--- a/java/org/apache/catalina/ssi/SSIFilter.java
+++ b/java/org/apache/catalina/ssi/SSIFilter.java
@@ -154,7 +154,7 @@ public class SSIFilter implements Filter {
Matcher shtmlMatcher =
shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
if (shtmlMatcher.matches()) {
- // Convert shtml mime type to ordinary html mime type but
preserve
+ // Convert SHTML mime type to ordinary HTML mime type but
preserve
// encoding, if any.
String enc = shtmlMatcher.group(1);
res.setContentType("text/html" + ((enc != null) ? enc : ""));
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 0578e21..26659b7 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -52,8 +52,8 @@ import org.apache.catalina.startup.TomcatBaseTest;
* as a path parameter appended to ALL urls within its response. That is
* achievable with servlets, jsps, jstl (all of which which can ask for an
* encoded url to be inserted into the dynamic web page). It cannot work
- * with static html.
- * note: this test class uses the tomcat somaple jsps, which conform.
+ * with static HTML.
+ * note: this test class uses the Tomcat sample jsps, which conform.
*
* 3. Therefore, any webapp that MIGHT need to authenticate a client that
* does not accept cookies MUST generate EVERY protected resource url
@@ -498,7 +498,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position within doTest.
*/
@Override
@@ -507,7 +507,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
}
/*
- * verify the server response html body is the page we expect,
+ * verify the server response HTML body is the page we expect,
* based on the dialogue position given by the caller.
*/
public boolean isResponseBodyOK(int testPhase) {
diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java
b/test/org/apache/catalina/startup/SimpleHttpClient.java
index d89c46d..13d5246 100644
--- a/test/org/apache/catalina/startup/SimpleHttpClient.java
+++ b/test/org/apache/catalina/startup/SimpleHttpClient.java
@@ -356,7 +356,7 @@ public abstract class SimpleHttpClient {
}
/*
- * Scan an html body for a given html uri element, starting from the
+ * Scan an HTML body for a given HTML uri element, starting from the
* given index into the source string. If any are found, simply
* accumulate them as literal strings, including angle brackets.
* note: nested elements will not be collected.
diff --git a/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
b/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
index 895e5bb..34ac70e 100644
--- a/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
+++ b/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
@@ -37,7 +37,7 @@ public class TesterServletEncodeUrl extends HttpServlet {
* <p>
* The request parameter <code>nextUrl</code> specifies the url to which
the
* caller would like to go next. If supplied, put an encoded url into the
- * returned html page as a hyperlink.
+ * returned HTML page as a hyperlink.
*/
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java
b/webapps/examples/WEB-INF/classes/RequestInfoExample.java
index 791e088..abc1366 100644
--- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java
+++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java
@@ -56,7 +56,7 @@ public class RequestInfoExample extends HttpServlet {
out.println("</head>");
out.println("<body bgcolor=\"white\">");
- // img stuff not req'd for source code html showing
+ // img stuff not req'd for source code HTML showing
// all links relative!
// XXX
diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java
b/webapps/examples/WEB-INF/classes/RequestParamExample.java
index b5e2dfa..e551dc5 100644
--- a/webapps/examples/WEB-INF/classes/RequestParamExample.java
+++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java
@@ -56,7 +56,7 @@ public class RequestParamExample extends HttpServlet {
out.println("</head>");
out.println("<body bgcolor=\"white\">");
- // img stuff not req'd for source code html showing
+ // img stuff not req'd for source code HTML showing
// all links relative
diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java
b/webapps/examples/WEB-INF/classes/SessionExample.java
index a306560..c000e84 100644
--- a/webapps/examples/WEB-INF/classes/SessionExample.java
+++ b/webapps/examples/WEB-INF/classes/SessionExample.java
@@ -60,7 +60,7 @@ public class SessionExample extends HttpServlet {
out.println("</head>");
out.println("<body bgcolor=\"white\">");
- // img stuff not req'd for source code html showing
+ // img stuff not req'd for source code HTML showing
// relative links everywhere!
// XXX
diff --git a/webapps/examples/jsp/cal/cal1.jsp
b/webapps/examples/jsp/cal/cal1.jsp
index d845ac4..6454311 100644
--- a/webapps/examples/jsp/cal/cal1.jsp
+++ b/webapps/examples/jsp/cal/cal1.jsp
@@ -30,7 +30,7 @@
if (table.getProcessError() == false) {
%>
-<!-- html table goes here -->
+<!-- HTML table goes here -->
<CENTER>
<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
<TR>
diff --git a/webapps/examples/jsp/cal/login.html
b/webapps/examples/jsp/cal/login.html
index 2c4aa55..8a62eca 100644
--- a/webapps/examples/jsp/cal/login.html
+++ b/webapps/examples/jsp/cal/login.html
@@ -40,7 +40,7 @@
<hr>
<font size=3 color="red"> Note: This application does not implement the
complete
functionality of a typical calendar application. It demonstrates a way JSP can
-be used with html tables and forms.</font>
+be used with HTML tables and forms.</font>
</center>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
