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 884fe5a0b9 BZ 69373: Make DefaultServlet's HTML listing file last
modified rendering better (flexible)
884fe5a0b9 is described below
commit 884fe5a0b9d975f7993e6e23d732c63e708c12c7
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Fri Oct 4 22:14:16 2024 +0200
BZ 69373: Make DefaultServlet's HTML listing file last modified rendering
better (flexible)
---
java/org/apache/catalina/servlets/DefaultServlet.java | 17 ++++++++++++++++-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 46d14d1e6f..abbef0dc09 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -73,6 +73,7 @@ import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
import org.apache.catalina.webresources.CachedResource;
import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.ResponseUtil;
import org.apache.tomcat.util.http.parser.ContentRange;
import org.apache.tomcat.util.http.parser.EntityTag;
@@ -1794,7 +1795,7 @@ public class DefaultServlet extends HttpServlet {
sb.append("</tt></td>\r\n");
sb.append("<td align=\"right\"><tt>");
- sb.append(childResource.getLastModifiedHttp());
+ sb.append(renderTimestamp(childResource.getLastModified()));
sb.append("</tt></td>\r\n");
sb.append("</tr>\r\n");
@@ -1846,6 +1847,20 @@ public class DefaultServlet extends HttpServlet {
}
+ /**
+ * Render the specified file timestamp.
+ *
+ * @param timestamp File timestamp
+ *
+ * @return the formatted timestamp
+ */
+ protected String renderTimestamp(long timestamp) {
+
+ return FastHttpDateFormat.formatDate(timestamp);
+
+ }
+
+
/**
* Get the readme file as a string.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a991dd9ea7..d2d8a98ada 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
<bug>69374</bug>: Properly separate between table header and body
in <code>DefaultServlet</code>'s listing. (michaelo)
</update>
+ <update>
+ <bug>69373</bug>: Make <code>DefaultServlet</code>'s HTML listing
+ file last modified rendering better (flexible). (michaelo)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
