Ticket #4779: 4779.r8522.diff

http.php

@@ -313 +313 @@
         /**
          * 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.
+         * 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.
          *
-         * Checking could be added, but it is easier and faster to just passed the
-         * array through and assume that it has already been processed.
-         *
          * @access public
          * @static
          * @since 2.7
@@ -330 +325 @@
          * @return array Processed string headers 
          */
         function processHeaders($headers) {
-                if ( is_array($headers) )
-                        return $headers;
+                if ( is_string($headers) )
+                        $headers = explode("\n", str_replace(array("\r\n", "\r"), "\n", $headers) );
 
-                $headers = explode("\n", str_replace(array("\r\n", "\r"), "\n", $headers) );
-
                 $response = array('code' => 0, 'message' => '');
 
                 $newheaders = array();
@@ -342 +335 @@
                         if ( empty($tempheader) )
                                 continue;
 
+                        
                         if ( false === strpos($tempheader, ':') ) {
                                 list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
                                 $response['code'] = $iResponseCode;
@@ -560 +554 @@
                 } else {
                         $theHeaders = $http_response_header;
                 }
-                $processedHeaders = WP_Http::processHeaders($theHeaders);
 
                 fclose($handle);
+
+                $processedHeaders = WP_Http::processHeaders($theHeaders);
+
                 return array('headers' => $processedHeaders['headers'], 'body' => $strResponse, 'response' => $processedHeaders['response']);
         }
 
@@ -762 +758 @@
                 $theHeaders = WP_Http::processHeaders($theHeaders);
 
                 $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);
         }