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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 75cff6d27e Deprecate WebdavFixFilter
75cff6d27e is described below

commit 75cff6d27e415b99afb251067d7fcf125f72ba74
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 24 13:03:13 2024 +0100

    Deprecate WebdavFixFilter
---
 java/org/apache/catalina/filters/WebdavFixFilter.java |  4 ++++
 java/org/apache/catalina/servlets/WebdavServlet.java  |  6 ++++++
 webapps/docs/changelog.xml                            |  4 ++++
 webapps/docs/config/filter.xml                        | 12 ++++++------
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java 
b/java/org/apache/catalina/filters/WebdavFixFilter.java
index 1d1b555a58..c9d39e1e29 100644
--- a/java/org/apache/catalina/filters/WebdavFixFilter.java
+++ b/java/org/apache/catalina/filters/WebdavFixFilter.java
@@ -51,7 +51,11 @@ import org.apache.tomcat.util.res.StringManager;
  * <li>Only connects to port 80</li>
  * <li>Unknown issue means it doesn't work</li>
  * </ul>
+ *
+ * @deprecated This will be removed in Tomcat 11 onwards. This filter is no 
longer required. The WebDAV client in
+ *             Windows 10 / Windows Server 2012 onwards works correctly 
without this filter.
  */
+@Deprecated
 public class WebdavFixFilter extends GenericFilter {
 
     private static final long serialVersionUID = 1L;
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java 
b/java/org/apache/catalina/servlets/WebdavServlet.java
index ccdebc338e..1b5a4051ac 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -130,6 +130,12 @@ import org.xml.sax.SAXException;
  * access will be able to edit content available via 
http://host:port/context/content using
  * http://host:port/context/webdavedit/content
  *
+ * <p>
+ * There are some known limitations of this Servlet due to it not implementing 
the PROPPATCH method. Details of these
+ * limitations and progress towards addressing them are being tracked under
+ * <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=69046>bug 
69046</a>.</p>
+ * </p>
+ *
  * @see <a href="https://tools.ietf.org/html/rfc4918";>RFC 4918</a>
  */
 public class WebdavServlet extends DefaultServlet implements 
PeriodicEventListener {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c842f0077a..31a03720b3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -110,6 +110,10 @@
       <add>
         Add support for shallow copies when using WebDAV. (markt)
       </add>
+      <scode>
+        Deprecate the <code>WebdavFixFilter</code> as it is no longer required.
+        (markt)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index 12e70181de..8dcbd39ef8 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -1997,12 +1997,12 @@ 
org.apache.catalina.filters.RequestDumperFilter.handlers = \
 
   <subsection name="Introduction">
 
-    <p>Microsoft operating systems have two WebDAV clients. One is used with
-    port 80, the other is used for all other ports. The implementation used 
with
-    port 80 does not adhere to the WebDAV specification and fails when trying 
to
-    communicate with the Tomcat WebDAV Servlet. This Filter provides a fix for
-    this by forcing the use of the WebDAV implementation that works, even when
-    connecting via port 80.</p>
+    <p>This filter was written for Windows NT era Microsoft operating systems
+    that shipped with WebDAV clients that were not compliant with the RFC. This
+    filter is no longer required for current WebDAV clients provided by current
+    (Windows 10 / Windows Server 2012 onwards) Windows operating systems. It 
has
+    been deprecated and will be removed in Tomcat 11 onwards.
+    </p>
 
   </subsection>
 


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

Reply via email to