StreamClient, CurlClient: fixed multiple line headers receiving [Ref #8]

milo · milo · commit f8dc2d4ba958 · 2015-02-08T19:51:12.000+01:00
diff --git a/src/Github/Http/CurlClient.php b/src/Github/Http/CurlClient.php
@@ -72,15 +72,18 @@ protected function process(Request $request)
 			CURLOPT_RETURNTRANSFER => TRUE,
 			CURLOPT_POSTFIELDS => $request->getContent(),
 			CURLOPT_HEADER => FALSE,
-			CURLOPT_HEADERFUNCTION => function($curl, $line) use (& $responseHeaders) {
+			CURLOPT_HEADERFUNCTION => function($curl, $line) use (& $responseHeaders, & $last) {
 				if (strncasecmp($line, 'HTTP/', 5) === 0) {
 					/** @todo Set proxy response as Response::setPrevious($proxyResponse)? */
 					# The HTTP/x.y may occur multiple times with proxy (HTTP/1.1 200 Connection Established)
 					$responseHeaders = [];
 
+				} elseif (in_array(substr($line, 0, 1), [' ', "\t"], TRUE)) {
+					$responseHeaders[$last] .= ' ' . trim($line);  # RFC2616, 2.2
+
 				} elseif ($line !== "\r\n") {
 					list($name, $value) = explode(':', $line, 2);
-					$responseHeaders[trim($name)] = trim($value);
+					$responseHeaders[$last = trim($name)] = trim($value);
 				}
 
 				return strlen($line);
diff --git a/src/Github/Http/StreamClient.php b/src/Github/Http/StreamClient.php
@@ -103,8 +103,12 @@ protected function fileGetContents($url, array $contextOptions)
 
 		$headers = [];
 		foreach ($http_response_header as $header) {
-			list($name, $value) = explode(':', $header, 2) + [NULL, NULL];
-			$headers[trim($name)] = trim($value);
+			if (in_array(substr($header, 0, 1), [' ', "\t"], TRUE)) {
+				$headers[$last] .= ' ' . trim($header);  # RFC2616, 2.2
+			} else {
+				list($name, $value) = explode(':', $header, 2) + [NULL, NULL];
+				$headers[$last = trim($name)] = trim($value);
+			}
 		}
 
 		return [$m[1], $headers, $content];
