[tomcat] branch 7.0.x updated: BZ 64386: WebdavServlet does not send "getlastmodified" property for resource collection

[michaelo]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
     new f3c1835  BZ 64386: WebdavServlet does not send "getlastmodified" 
property for resource collection
f3c1835 is described below

commit f3c18356182dc12b677904a392deaa7521050c02
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Wed Apr 29 11:05:25 2020 +0200

    BZ 64386: WebdavServlet does not send "getlastmodified" property for 
resource collection
---
 java/org/apache/catalina/servlets/WebdavServlet.java | 2 ++
 webapps/docs/changelog.xml                           | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 4d0f8d4..2623a94 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -2218,6 +2218,8 @@ public class WebdavServlet extends DefaultServlet {
                     generatedXML.writeElement("D", "resourcetype", 
XMLWriter.NO_CONTENT);
                 }
             } else {
+                generatedXML.writeProperty("D", "getlastmodified",
+                        FastHttpDateFormat.formatDate(lastModified));
                 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.OPENING);
                 generatedXML.writeElement("D", "collection", 
XMLWriter.NO_CONTENT);
                 generatedXML.writeElement("D", "resourcetype", 
XMLWriter.CLOSING);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f548be..938bc08 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,10 @@
         Add more descriptive error message in DefaultServlet for SC_NOT_FOUND.
         (michaelo)
       </add>
+      <add>
+        <bug>64386</bug>: WebdavServlet does not send "getlastmodified"
+        property for resource collections. (michaelo)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org