You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/05/31 16:57:20 UTC
[tomcat] branch 10.1.x updated (8f46ae849d -> 38fba76045)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 8f46ae849d Bug 66618: add longDate attribute to XML in directory listing
new 3e798a4739 Simplify code
new 38fba76045 Fix BZ 66621 - remove expired locks from correct collection
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/servlets/WebdavServlet.java | 6 ++----
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix BZ 66621 - remove expired locks from correct collection
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 38fba760458219a111e6c84927eb48a9dc623f74
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 31 17:56:36 2023 +0100
Fix BZ 66621 - remove expired locks from correct collection
https://bz.apache.org/bugzilla/show_bug.cgi?id=66621
---
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index 067c3d5a49..c9be178963 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1058,7 +1058,7 @@ public class WebdavServlet extends DefaultServlet {
List<String> lockPaths = new ArrayList<>();
for (LockInfo currentLock : collectionLocks) {
if (currentLock.hasExpired()) {
- resourceLocks.remove(currentLock.path);
+ collectionLocks.remove(currentLock);
continue;
}
if (currentLock.path.startsWith(lock.path) &&
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f773d17d38..62af0f6618 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,10 @@
listings produced by the default servlet to enable sorting in the XSLT.
Pull request <pr>622</pr> by Alex Kachanov. (markt)
</add>
+ <fix>
+ <bug>66621</bug>: Attempts to lock a collection with WebDAV may
+ incorrectly fail if a child collection has an expired lock. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Simplify code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3e798a4739c646e2d384ada11b67ed5029db9231
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 31 17:30:12 2023 +0100
Simplify code
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
index 38448532aa..067c3d5a49 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -870,9 +870,7 @@ public class WebdavServlet extends DefaultServlet {
int lockDuration = DEFAULT_TIMEOUT;
String lockDurationStr = req.getHeader("Timeout");
- if (lockDurationStr == null) {
- lockDuration = DEFAULT_TIMEOUT;
- } else {
+ if (lockDurationStr != null) {
int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org