Changeset 57015

Timestamp:

10/26/2023 11:15:31 PM (6 months ago)

Author:

jorbin

Message:

REST API: Move rest_pre_serve_request filter to after no cache headers are sent.

Merges [57012] to 6.3 branch.

[56834] adjusted the order of activity inside the rest server responses. This lead to the rest_pre_serve_request filter potentially blocking the sending of the no cache headers. This moves that action back to being after the sending of no cache headers has finished to restore the pre 6.3.2 order of these two actions.

Props perrelet, SergeyBiryukov, peterwilsoncc, hellofromTonya.
Fixes #59722.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/class-wp-rest-server.php (modified) (2 diffs)

branches/6.3/src/wp-includes/rest-api/class-wp-rest-server.php

@@ -468 +468 @@
 
         /**
-         * Filters whether the REST API request has already been served.
-         *
-         * Allow sending the request manually - by returning true, the API result
-         * will not be sent to the client.
-         *
-         * @since 4.4.0
-         *
-         * @param bool             $served  Whether the request has already been served.
-         *                                           Default false.
-         * @param WP_HTTP_Response $result  Result to send to the client. Usually a `WP_REST_Response`.
-         * @param WP_REST_Request  $request Request used to generate the response.
-         * @param WP_REST_Server   $server  Server instance.
-         */
-        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
-
-        /**
          * Filters whether to send nocache headers on a REST API request.
          *
@@ -504 +488 @@
             }
         }
+
+        /**
+         * Filters whether the REST API request has already been served.
+         *
+         * Allow sending the request manually - by returning true, the API result
+         * will not be sent to the client.
+         *
+         * @since 4.4.0
+         *
+         * @param bool             $served  Whether the request has already been served.
+         *                                           Default false.
+         * @param WP_HTTP_Response $result  Result to send to the client. Usually a `WP_REST_Response`.
+         * @param WP_REST_Request  $request Request used to generate the response.
+         * @param WP_REST_Server   $server  Server instance.
+         */
+        $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
 
         if ( ! $served ) {