Fix BZ 69848 - Correct copy/paste error when refactoring method names

https://bz.apache.org/bugzilla/show_bug.cgi?id=69848

Author: markt-asf

java/org/apache/coyote/ajp/Constants.java

@@ -105,7 +105,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, Method.PROPPATCH, Method.MKCOL, Method.COPY,
+            { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST, Method.PUT, Method.DELETE, Method.TRACE, Method.TRACE, Method.PROPPATCH, Method.MKCOL, Method.COPY,
                     Method.MOVE, Method.LOCK, Method.UNLOCK, "ACL", "REPORT", "VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
                     "SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", "BASELINE-CONTROL", "MKACTIVITY" };
 

test/org/apache/catalina/realm/TestRealmBase.java

@@ -660,7 +660,7 @@ public void testHttpConstraint() throws IOException {
         SecurityConstraint deleteConstraint = new SecurityConstraint();
         deleteConstraint.addAuthRole(ROLE1);
         SecurityCollection deleteCollection = new SecurityCollection();
-        deleteCollection.addMethod(Method.OPTIONS);
+        deleteCollection.addMethod(Method.DELETE);
         deleteCollection.addPatternDecoded("/*");
         deleteConstraint.addCollection(deleteCollection);
 
@@ -772,7 +772,7 @@ public void testHttpConstraint() throws IOException {
 
         // Only user1 should be able to perform a DELETE as only that user has
         // role1.
-        request.setMethod(Method.OPTIONS);
+        request.setMethod(Method.DELETE);
 
         SecurityConstraint[] constraintsDelete =
                 mapRealm.findSecurityConstraints(request, context);

webapps/docs/changelog.xml

@@ -241,6 +241,11 @@
         <bug>69836</bug>: Incorrect processing of partitioned setting when
         generating session cookie. Patch submitted by Marc Pynaert. (remm)
       </fix>
+      <fix>
+        <bug>69848</bug>: Fix copy/paste error that meant DELETE requests
+        received via the AJP connector were processed as OPTIONS requests.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">