Changeset 45504

Timestamp:

06/08/2019 05:09:02 PM (5 years ago)

Author:

johnbillion

Message:

HTTP API: Ensure the http_api_debug hook is fired for all responses.

This means that logging and debugging functionality can access the error code and error message for erroneous responses under all conditions. The hook is not fired when a request is short-circuited with the pre_http_request filter, because this filter itself can be used in that situation.

Fixes #25747

File:

• trunk/src/wp-includes/class-http.php (modified) (2 diffs)

trunk/src/wp-includes/class-http.php

@@ -273 +273 @@
 
         if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
-            return new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
+            $response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
+            /** This action is documented in wp-includes/class-http.php */
+            do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+            return $response;
         }
 
         if ( $this->block_request( $url ) ) {
-            return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+            $response = new WP_Error( 'http_request_not_executed', __( 'User has blocked requests through HTTP.' ) );
+            /** This action is documented in wp-includes/class-http.php */
+            do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+            return $response;
         }
 
@@ -290 +296 @@
             $r['blocking'] = true;
             if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
-                return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+                $response = new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+                /** This action is documented in wp-includes/class-http.php */
+                do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
+                return $response;
             }
         }