Ticket #35975: 35975.2.diff

src/wp-includes/rest-api.php

@@ -431 +431 @@
                 }
 
                 $data = $handler->get_data_for_route( $route, $endpoints, 'help' );
-                $accept = array_merge( $accept, $data['methods'] );
+                $response->set_matched_route( $route );
                 break;
         }
-        $response->header( 'Accept', implode( ', ', $accept ) );
 
         $response->set_data( $data );
         return $response;

tests/phpunit/tests/rest-api/rest-server.php

@@ -285 +285 @@
                 $this->assertEquals( $sent_headers['Allow'], 'POST' );
         }
 
+        public function test_allow_header_sent_on_options_request() {
+                register_rest_route( 'test-ns', '/test', array(
+                        array(
+                                'methods'  => array( 'GET' ),
+                                'callback' => '__return_null',
+                        ),
+                        array(
+                                'methods'  => array( 'POST' ),
+                                'callback' => '__return_null',
+                                'permission_callback' => '__return_null',
+                        ),
+                ) );
+
+                $request = new WP_REST_Request( 'OPTIONS', '/test-ns/test' );
+                $response = $this->server->dispatch( $request );
+
+                $result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $response ), $this->server, $request );
+
+                $headers = $result->get_headers();
+
+                $this->assertEquals( 'GET', $headers['Allow'] );
+        }
+
         public function permission_denied() {
                 return new WP_Error( 'forbidden', 'You are not allowed to do this', array( 'status' => 403 ) );
         }