Changeset 10117

Timestamp:

12/07/2008 08:30:59 PM (16 years ago)

Author:

ryan

Message:

Fix raw_response code in Streams transport. Props jacobsantos. fixes #8476

File:

• trunk/wp-includes/http.php (modified) (4 diffs)

trunk/wp-includes/http.php

@@ -397 +397 @@
         // The body is not chunked encoding or is malformed.
         if ( ! preg_match( '/^[0-9a-f]+(\s|\n)+/mi', trim($body) ) )
-            return false;
+            return $body;
 
         $parsedBody = '';
@@ -673 +673 @@
             $meta = stream_get_meta_data($handle);
             $theHeaders = $meta['wrapper_data'];
+            if( isset( $meta['wrapper_data']['headers'] ) )
+                $theHeaders = $meta['wrapper_data']['headers'];
         } else {
+            if( ! isset( $http_response_header ) )
+                global $http_response_header;
             $theHeaders = $http_response_header;
         }
@@ -794 +798 @@
         $strResponse = stream_get_contents($handle);
         $meta = stream_get_meta_data($handle);
-        $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
+
+        $processedHeaders = array();
+        if( isset( $meta['wrapper_data']['headers'] ) )
+            $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']['headers']);
+        else
+            $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']);
 
         if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] )
@@ -1032 +1041 @@
             if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array(301, 302) ) )
                 return new WP_Error('http_request_failed', __('Too many redirects.'));
-            
+
             $theHeaders = array( 'headers' => array() );
             $theBody = '';