This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d50c021797 BZ 69374: Properly separate between table header and body
in DefaultServlet's listing
d50c021797 is described below
commit d50c02179742f82666af9c37c2d2669561310a4e
Author: Michael Osipov <[email protected]>
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 | 4 ++++
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index f95b821f62..46d14d1e6f 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1710,8 +1710,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'));
@@ -1721,8 +1722,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'));
@@ -1732,8 +1733,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'));
@@ -1743,14 +1744,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")) {
@@ -1796,6 +1799,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 b30a554613..180bb7d504 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
Remove default value (was <code>catalina</code>) for the
<code>secret</code> init parameter of the WebDAV Servlet. (remm)
</update>
+ <update>
+ <bug>69374</bug>: Properly separate between table header and body
+ in <code>DefaultServlet</code>'s listing. (michaelo)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
