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 7bf7a7c6ed BZ 69374: Properly separate between table header and body
in DefaultServlet's listing
7bf7a7c6ed is described below
commit 7bf7a7c6ed0e4327a395028fa3d8840fe0c7f2f6
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Fri Oct 4 21:16:02 2024 +0200
BZ 69374: Properly separate between table header and body in
DefaultServlet's listing
---
java/org/apache/catalina/servlets/DefaultServlet.java | 18 +++++++++++-------
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 374d859752..8b3d3f6046 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1736,8 +1736,9 @@ public class DefaultServlet extends HttpServlet {
order = null;
}
// Render the column headings
+ sb.append("<thead>\r\n");
sb.append("<tr>\r\n");
- sb.append("<td align=\"left\"><font size=\"+1\"><strong>");
+ sb.append("<th align=\"left\"><font size=\"+1\"><strong>");
if (sortListings && null != request) {
sb.append("<a href=\"?C=N;O=");
sb.append(getOrderChar(order, 'N'));
@@ -1747,8 +1748,8 @@ public class DefaultServlet extends HttpServlet {
} else {
sb.append(sm.getString("directory.filename"));
}
- sb.append("</strong></font></td>\r\n");
- sb.append("<td align=\"center\"><font size=\"+1\"><strong>");
+ sb.append("</strong></font></th>\r\n");
+ sb.append("<th align=\"center\"><font size=\"+1\"><strong>");
if (sortListings && null != request) {
sb.append("<a href=\"?C=S;O=");
sb.append(getOrderChar(order, 'S'));
@@ -1758,8 +1759,8 @@ public class DefaultServlet extends HttpServlet {
} else {
sb.append(sm.getString("directory.size"));
}
- sb.append("</strong></font></td>\r\n");
- sb.append("<td align=\"right\"><font size=\"+1\"><strong>");
+ sb.append("</strong></font></th>\r\n");
+ sb.append("<th align=\"right\"><font size=\"+1\"><strong>");
if (sortListings && null != request) {
sb.append("<a href=\"?C=M;O=");
sb.append(getOrderChar(order, 'M'));
@@ -1769,14 +1770,16 @@ public class DefaultServlet extends HttpServlet {
} else {
sb.append(sm.getString("directory.lastModified"));
}
- sb.append("</strong></font></td>\r\n");
- sb.append("</tr>");
+ sb.append("</strong></font></th>\r\n");
+ sb.append("</tr>\r\n");
+ sb.append("</thead>\r\n");
if (null != sortManager && null != request) {
sortManager.sort(entries, request.getQueryString());
}
boolean shade = false;
+ sb.append("<tbody>\r\n");
for (WebResource childResource : entries) {
String filename = childResource.getName();
if (filename.equalsIgnoreCase("WEB-INF") ||
filename.equalsIgnoreCase("META-INF")) {
@@ -1822,6 +1825,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("</tr>\r\n");
}
+ sb.append("</tbody>\r\n");
// Render the page footer
sb.append("</table>\r\n");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 23e3431126..8491e6ce29 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.1.32 (schultz)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ <bug>69374</bug>: Properly separate between table header and body
+ in <code>DefaultServlet</code>'s listing. (michaelo)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.1.31 (schultz)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
