Changeset 8523

Timestamp:

08/01/2008 10:31:57 PM (16 years ago)

Author:

ryan

Message:

Fixes process headers for fopen header return, fixes HTTP extension response array. Props santosj. see #4779

File:

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

trunk/wp-includes/http.php

@@ -314 +314 @@
      * Transform header string into an array.
      *
-     * If an array is given, then it will be immediately passed through with no
-     * changes. This is to prevent overhead in processing headers that don't
-     * need to be processed. That and it is unknown what kind of effect
-     * processing the array will have since there is no checking done on whether
-     * ':' does not exist within the array string.
-     *
-     * Checking could be added, but it is easier and faster to just passed the
-     * array through and assume that it has already been processed.
+     * If an array is given then it is assumed to be raw header data with
+     * numeric keys with the headers as the values. No headers must be passed
+     * that were already processed.
      *
      * @access public
@@ -331 +326 @@
      */
     function processHeaders($headers) {
-        if ( is_array($headers) )
-            return $headers;
-
-        $headers = explode("\n", str_replace(array("\r\n", "\r"), "\n", $headers) );
+        if ( is_string($headers) )
+            $headers = explode("\n", str_replace(array("\r\n", "\r"), "\n", $headers) );
 
         $response = array('code' => 0, 'message' => '');
@@ -343 +336 @@
                 continue;
 
+            
             if ( false === strpos($tempheader, ':') ) {
                 list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
@@ -561 +555 @@
             $theHeaders = $http_response_header;
         }
+
+        fclose($handle);
+
         $processedHeaders = WP_Http::processHeaders($theHeaders);
 
-        fclose($handle);
         return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response']);
     }
@@ -763 +759 @@
 
         $theResponse = array();
-        $theResponse['response']['code'] = $info['response_code'];
-        $theResponse['response']['message'] = get_status_header_desc($info['response_code']);
+        $theResponse['code'] = $info['response_code'];
+        $theResponse['message'] = get_status_header_desc($info['response_code']);
 
         return array('headers' => $theHeaders['headers'], 'body' => $theBody, 'response' => $theResponse);