Ticket #9395: http.diff

http.php

@@ -404 +404 @@
 
                 $cookies = array();
                 $newheaders = array();
+
+                // first, process the HTTP status line
+                if ( false === strpos($headers[0], ':') ) {
+                        $tempheader = array_shift($headers);
+                        list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
+                        $response['code'] = $iResponseCode;
+                        $response['message'] = $strResponseMsg;
+                }
+
+                // combine any headers split over multiple lines
+                for ( $i=(sizeof($headers)-1); $i>=0; $i-- ) {
+                        $c = substr($headers[$i], 0, 1);
+                        if ($c == ' ' || $c == "\t") {
+                                $headers[$i-1] = rtrim($headers[$i-1]) . ' ' . ltrim($headers[$i]);
+                                unset($headers[$i]);
+                        }
+                }
+
                 foreach ( $headers as $tempheader ) {
                         if ( empty($tempheader) )
                                 continue;
 
-                        if ( false === strpos($tempheader, ':') ) {
-                                list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
-                                $response['code'] = $iResponseCode;
-                                $response['message'] = $strResponseMsg;
-                                continue;
-                        }
-
                         list($key, $value) = explode(':', $tempheader, 2);
 
                         if ( !empty( $value ) ) {