Ticket #8620: http.2.diff

wp-includes/http.php

@@ -1176 +1176 @@
  * @return array The headers of the response. Empty array if incorrect parameter given.
  */
 function wp_remote_retrieve_headers(&$response) {
-        if ( ! isset($response['headers']) || ! is_array($response['headers']))
+        if ( is_wp_error($response) )
+                return $response;
+                
+        if ( ! isset($response['headers']) || ! is_array($response['headers']) )
                 return array();
 
         return $response['headers'];
@@ -1192 +1195 @@
  * @return array The header value. Empty string on if incorrect parameter given.
  */
 function wp_remote_retrieve_header(&$response, $header) {
-        if ( ! isset($response['headers']) || ! is_array($response['headers']))
+        if ( is_wp_error($response) )
+                return $response;
+                
+        if ( ! isset($response['headers']) || ! is_array($response['headers']) )
                 return '';
 
         if ( array_key_exists($header, $response['headers']) )
@@ -1212 +1218 @@
  * @return array The keys 'code' and 'message' give information on the response.
  */
 function wp_remote_retrieve_response_code(&$response) {
-        if ( ! isset($response['response']) || ! is_array($response['response']))
+        if ( is_wp_error($response) )
+                return $response;
+        
+        if ( ! isset($response['response']) || ! is_array($response['response']) )
                 return '';
 
         return $response['response']['code'];
@@ -1229 +1238 @@
  * @return array The keys 'code' and 'message' give information on the response.
  */
 function wp_remote_retrieve_response_message(&$response) {
-        if ( ! isset($response['response']) || ! is_array($response['response']))
+        if ( is_wp_error($response) )
+                return $response;
+                
+        if ( ! isset($response['response']) || ! is_array($response['response']) )
                 return '';
 
         return $response['response']['message'];
@@ -1244 +1256 @@
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
 function wp_remote_retrieve_body(&$response) {
+        if ( is_wp_error($response) )
+                return $response;
+                
         if ( ! isset($response['body']) )
                 return '';