This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d62ce93a4383353c2ce44555a972cff9d1fdb213 Author: Mark Thomas <[email protected]> AuthorDate: Thu Sep 11 12:28:55 2025 +0100 Use constant for PROPPATCH --- java/org/apache/coyote/ajp/Constants.java | 2 +- .../apache/catalina/servlets/TestWebdavServletOptionCollection.java | 2 +- test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java | 2 +- .../org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java | 2 +- test/org/apache/coyote/ajp/SimpleAjpClient.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java index 34ddba6569..e5ee52f64b 100644 --- a/java/org/apache/coyote/ajp/Constants.java +++ b/java/org/apache/coyote/ajp/Constants.java @@ -107,7 +107,7 @@ public final class Constants { // Translates integer codes to names of HTTP methods private static final String[] methodTransArray = - { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST, Method.PUT, Method.OPTIONS, Method.TRACE, Method.TRACE, "PROPPATCH", "MKCOL", "COPY", + { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST, Method.PUT, Method.OPTIONS, Method.TRACE, Method.TRACE, Method.PROPPATCH, "MKCOL", "COPY", "MOVE", "LOCK", "UNLOCK", "ACL", "REPORT", "VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT", "SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", "BASELINE-CONTROL", "MKACTIVITY" }; diff --git a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java index fec223fefd..58ba7a3a53 100644 --- a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java +++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java @@ -38,7 +38,7 @@ public class TestWebdavServletOptionCollection extends ServletOptionsBaseTest { @Parameters public static Collection<Object[]> inputs() { String[] methods = new String[] { Method.GET, Method.POST, Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE, - "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, "PROPPATCH" }; + "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, Method.PROPPATCH }; List<Object[]> result = new ArrayList<>(); diff --git a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java index b145e5d2cc..1c047a247a 100644 --- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java +++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java @@ -38,7 +38,7 @@ public class TestWebdavServletOptionsFile extends ServletOptionsBaseTest { @Parameters public static Collection<Object[]> inputs() { String[] methods = new String[] { Method.GET, Method.POST, Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE, - "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, "PROPPATCH" }; + "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, Method.PROPPATCH }; List<Object[]> result = new ArrayList<>(); diff --git a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java index 597f357117..b5f0dc5d46 100644 --- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java +++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java @@ -38,7 +38,7 @@ public class TestWebdavServletOptionsUnknown extends ServletOptionsBaseTest { @Parameters public static Collection<Object[]> inputs() { String[] methods = new String[] { Method.GET, Method.POST, Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE, - "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, "PROPPATCH" }; + "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, Method.PROPPATCH }; List<Object[]> result = new ArrayList<>(); diff --git a/test/org/apache/coyote/ajp/SimpleAjpClient.java b/test/org/apache/coyote/ajp/SimpleAjpClient.java index 5465d80913..6a3c43fa56 100644 --- a/test/org/apache/coyote/ajp/SimpleAjpClient.java +++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java @@ -100,7 +100,7 @@ public class SimpleAjpClient { case Method.PROPFIND: this.method = 8; break; - case "PROPPATCH": + case Method.PROPPATCH: this.method = 9; break; case "MKCOL": @@ -181,7 +181,7 @@ public class SimpleAjpClient { case 8: return Method.PROPFIND; case 9: - return "PROPPATCH"; + return Method.PROPPATCH; case 10: return "MKCOL"; case 11: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
