This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4c5a2697fa Improve HTML output of <code>DefaultServlet
4c5a2697fa is described below
commit 4c5a2697facb00b3f9606f827d7daf443da8e2a6
Author: Michael Osipov <[email protected]>
AuthorDate: Sat Oct 5 19:18:17 2024 +0200
Improve HTML output of <code>DefaultServlet
---
java/org/apache/catalina/servlets/DefaultServlet.java | 17 +++++++++--------
webapps/docs/changelog.xml | 3 +++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 862c4c5fa0..385ba14af9 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1684,7 +1684,8 @@ public class DefaultServlet extends HttpServlet {
String rewrittenContextPath = rewriteUrl(contextPath);
// Render the page header
- sb.append("<!doctype html><html>\r\n");
+ sb.append("<!doctype html>\r\n");
+ sb.append("<html>\r\n");
/*
* TODO Activate this as soon as we use smClient with the request
locales
* sb.append("<!doctype html><html lang=\"");
sb.append(smClient.getLocale().getLanguage()).append("\">\r\n");
@@ -1695,9 +1696,9 @@ public class DefaultServlet extends HttpServlet {
sb.append("</title>\r\n");
sb.append("<style>");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
- sb.append("</style> ");
+ sb.append("</style>\r\n");
sb.append("</head>\r\n");
- sb.append("<body>");
+ sb.append("<body>\r\n");
sb.append("<h1>");
sb.append(sm.getString("directory.title", directoryWebappPath));
@@ -1725,8 +1726,8 @@ public class DefaultServlet extends HttpServlet {
sb.append("</a>");
}
- sb.append("</h1>");
- sb.append("<hr class=\"line\">");
+ sb.append("</h1>\r\n");
+ sb.append("<hr class=\"line\">\r\n");
sb.append("<table width=\"100%\" cellspacing=\"0\"" + "
cellpadding=\"5\" align=\"center\">\r\n");
@@ -1831,16 +1832,16 @@ public class DefaultServlet extends HttpServlet {
// Render the page footer
sb.append("</table>\r\n");
- sb.append("<hr class=\"line\">");
+ sb.append("<hr class=\"line\">\r\n");
String readme = getReadme(resource, encoding);
if (readme != null) {
sb.append(readme);
- sb.append("<hr class=\"line\">");
+ sb.append("<hr class=\"line\">\r\n");
}
if (showServerInfo) {
-
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>");
+
sb.append("<h3>").append(ServerInfo.getServerInfo()).append("</h3>\r\n");
}
sb.append("</body>\r\n");
sb.append("</html>\r\n");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c9a27fbdeb..d46dfce754 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,9 @@
<bug>69373</bug>: Make <code>DefaultServlet</code>'s HTML listing
file last modified rendering better (flexible). (michaelo)
</update>
+ <update>
+ Improve HTML output of <code>DefaultServlet</code>. (michaelo)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
