Ticket #25747: 25747.2.diff

src/wp-includes/class-http.php

@@ -176 +176 @@
                  * @param string $url     The request URL.
                  */
                 $pre = apply_filters( 'pre_http_request', false, $r, $url );
-                if ( false !== $pre )
-                        return $pre;
+                if ( false !== $pre ) {
+                        return self::log_response( $pre, false, $r, $url );
+                }
 
                 if ( function_exists( 'wp_kses_bad_protocol' ) ) {
                         if ( $r['reject_unsafe_urls'] )
@@ -189 +190 @@
 
                 $arrURL = @parse_url( $url );
 
-                if ( empty( $url ) || empty( $arrURL['scheme'] ) )
-                        return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+                if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+                        $response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
+                        return self::log_response( $response, false, $r, $url );
+                }
 
-                if ( $this->block_request( $url ) )
-                        return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+                if ( $this->block_request( $url ) ) {
+                        $response = new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+                        return self::log_response( $response, false, $r, $url );
+                }
 
                 /*
                  * Determine if this is a https call and pass that on to the transport functions
@@ -220 +225 @@
                  */
                 if ( $r['stream'] ) {
                         $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.' ) );
+                        if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
+                                $response = new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+                                return self::log_response( $response, false, $r, $url );
+                        }
                 }
 
                 if ( is_null( $r['headers'] ) )
@@ -349 +356 @@
                 static $transports = array();
 
                 $class = $this->_get_first_available_transport( $args, $url );
-                if ( !$class )
-                        return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+                if ( !$class ) {
+                        $response = new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+                        return self::log_response( $response, $class, $args, $url );
+                }
 
                 // Transport claims to support request, instantiate it and give it a whirl.
                 if ( empty( $transports[$class] ) )
                         $transports[$class] = new $class;
 
                 $response = $transports[$class]->request( $url, $args );
-
-                /**
-                 * Fires after an HTTP API response is received and before the response is returned.
-                 *
-                 * @since 2.8.0
-                 *
-                 * @param array|WP_Error $response HTTP response or WP_Error object.
-                 * @param string         $context  Context under which the hook is fired.
-                 * @param string         $class    HTTP transport used.
-                 * @param array          $args     HTTP request arguments.
-                 * @param string         $url      The request URL.
-                 */
-                do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+                $response = self::log_response( $response, $class, $args, $url );
 
                 if ( is_wp_error( $response ) )
                         return $response;
@@ -387 +384 @@
         }
 
         /**
+         * Log an HTTP API response via the `http_api_debug` action.
+         *
+         * @since 4.2.0
+         *
+         * @param array|WP_Error $response HTTP response or WP_Error object.
+         * @param string|false   $class    HTTP transport used, if any.
+         * @param array          $args     HTTP request arguments.
+         * @param string         $url      The request URL.
+         * @return array|WP_Error          HTTP response or WP_Error object.
+         */
+        public static function log_response( $response, $class, $args, $url ) {
+                /**
+                 * Fires after an HTTP API response is received and before the response is returned.
+                 *
+                 * @since 2.8.0
+                 * @since 3.3.0 Added `$args` and `$url` parameters.
+                 *
+                 * @param array|WP_Error $response HTTP response or WP_Error object.
+                 * @param string         $context  Context under which the hook is fired.
+                 * @param string|false   $class    HTTP transport used, if any.
+                 * @param array          $args     HTTP request arguments.
+                 * @param string         $url      The request URL.
+                 */
+                do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+
+                return $response;
+        }
+
+        /**
          * Uses the POST HTTP method.
          *
          * Used for sending data that is expected to be in the body.
@@ -834 +860 @@
                         }
                 }
 
+                $response = self::log_response( $response, false, $args, $url );
+
                 return wp_remote_request( $redirect_location, $args );
         }