Ticket #13513: 13513.patch

wp-includes/class-http.php

@@ -409 +409 @@
          * @return array Processed string headers. If duplicate headers are encountered,
          *                                      Then a numbered array is returned as the value of that header-key.
          */
-        function processHeaders($headers) {
+        function processHeaders( $headers ) {
                 // split headers, one per array element
-                if ( is_string($headers) ) {
+                if ( is_string( $headers ) ) {
                         // tolerate line terminator: CRLF = LF (RFC 2616 19.3)
-                        $headers = str_replace("\r\n", "\n", $headers);
+                        $headers = str_replace( "\r\n", "\n", $headers );
                         // unfold folded header fields. LWS = [CRLF] 1*( SP | HT ) <US-ASCII SP, space (32)>, <US-ASCII HT, horizontal-tab (9)> (RFC 2616 2.2)
-                        $headers = preg_replace('/\n[ \t]/', ' ', $headers);
+                        $headers = preg_replace( '/\n[ \t]/', ' ', $headers );
                         // create the headers array
-                        $headers = explode("\n", $headers);
+                        $headers = explode( "\n", $headers );
                 }
 
-                $response = array('code' => 0, 'message' => '');
-
                 // If a redirection has taken place, The headers for each page request may have been passed.
                 // In this case, determine the final HTTP header and parse from there.
-                for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-                        if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
+                for ( $i = count( $headers )-1; $i >= 0; $i-- ) {
+                        if ( !empty( $headers[$i] ) && false === strpos($headers[$i], ':') ) {
                                 $headers = array_splice($headers, $i);
                                 break;
                         }
                 }
 
-                $cookies = array();
+                $response   = array( 'code' => 0, 'message' => '', 'toset' => true );           
                 $newheaders = array();
+                $cookies    = array();          
+
                 foreach ( $headers as $tempheader ) {
-                        if ( empty($tempheader) )
+                        if ( empty( $tempheader ) )
                                 continue;
 
-                        if ( false === strpos($tempheader, ':') ) {
-                                list( , $response['code'], $response['message']) = explode(' ', $tempheader, 3);
+                        if ( false === strpos( $tempheader, ':' ) ) {
+                                if ( $response['toset'] ) {
+                                        list( , $response['code'], $response['message'] ) = explode( ' ', $tempheader, 3 );
+                                        $response['toset']                                = false;
+                                }
                                 continue;
                         }
 
-                        list($key, $value) = explode(':', $tempheader, 2);
+                        list( $key, $value ) = explode( ':', $tempheader, 2 );
 
-                        if ( !empty( $value ) ) {
-                                $key = strtolower( $key );
-                                if ( isset( $newheaders[$key] ) ) {
-                                        if ( !is_array($newheaders[$key]) )
-                                                $newheaders[$key] = array($newheaders[$key]);
-                                        $newheaders[$key][] = trim( $value );
-                                } else {
-                                        $newheaders[$key] = trim( $value );
-                                }
-                                if ( 'set-cookie' == strtolower( $key ) )
-                                        $cookies[] = new WP_Http_Cookie( $value );
-                        }
+                        if ( empty( $value ) )
+                                continue;
+                        
+                        $key = strtolower( $key );
+                        
+                        if ( isset( $newheaders[$key] ) )
+                                $newheaders[$key] .= ',';
+                        else
+                                $newheaders[$key] = '';
+                        $newheaders[$key] .= trim( $value );
+                        
+                        if ( 'set-cookie' == $key )
+                                $cookies[] = new WP_Http_Cookie( $value );
                 }
 
                 return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);