(tomcat) branch 11.0.x updated: Improve HTML output of DefaultServlet

Sat, 05 Oct 2024 10:23:23 -0700 

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 4108bf15b5 Improve HTML output of <code>DefaultServlet
4108bf15b5 is described below

commit 4108bf15b54cc82b56736edf07cff4561e8d457c
Author: Michael Osipov <micha...@apache.org>
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 abbef0dc09..1dce680db8 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1658,7 +1658,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");
@@ -1669,9 +1670,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));
 
@@ -1699,8 +1700,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");
 
@@ -1805,16 +1806,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 d2d8a98ada..f70a705d19 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to