Changeset 37436 for trunk

Timestamp:

05/16/2016 06:11:58 AM (10 years ago)

Author:

rmccue

Message:

HTTP API: Pass array-like object to http_api_debug.

This was mistakingly passing the Requests_Response object, which caused fatal errors with debugging tools.

See #33055.

File:

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

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

@@ -350 +350 @@
                 try {
                         $response = Requests::request( $url, $headers, $data, $type, $options );
+
+                        // Convert the response into an array
+                        $response = new WP_HTTP_Requests_Response( $response, $r['filename'] );
                 }
                 catch ( Requests_Exception $e ) {
@@ -383 +386 @@
                 }
 
-                // Convert the response into an array
-                $data = new WP_HTTP_Requests_Response( $response, $r['filename'] );
-
                 /**
                  * Filter the HTTP API response immediately before the response is returned.
@@ -391 +391 @@
                  * @since 2.9.0
                  *
-                 * @param array  $data HTTP response.
-                 * @param array  $r    HTTP request arguments.
-                 * @param string $url  The request URL.
+                 * @param array  $response HTTP response.
+                 * @param array  $r        HTTP request arguments.
+                 * @param string $url      The request URL.
                  */
-                return apply_filters( 'http_response', $data, $r, $url );
+                return apply_filters( 'http_response', $response, $r, $url );
         }