CurlClient: use CURLOPT_HEADERFUNCTION for headers grabbing [Ref #5]

Thanks to @mike503

Author: milo

src/Github/Http/CurlClient.php

@@ -53,6 +53,8 @@ protected function process(Request $request)
 			$headers[] = "$name: $value";
 		}
 
+		$responseHeaders = NULL;
+
 		$softOptions = [
 			CURLOPT_CONNECTTIMEOUT => 10,
 			CURLOPT_SSL_VERIFYHOST => 2,
@@ -62,7 +64,6 @@ protected function process(Request $request)
 
 		$hardOptions = [
 			CURLOPT_FOLLOWLOCATION => FALSE, # Github sets the Location header for 201 code too and redirection is not required for us
-			CURLOPT_HEADER => TRUE,
 			CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
 			CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS,
 			CURLOPT_CUSTOMREQUEST => $request->getMethod(),
@@ -71,6 +72,19 @@ protected function process(Request $request)
 			CURLOPT_HTTPHEADER => $headers,
 			CURLOPT_RETURNTRANSFER => TRUE,
 			CURLOPT_POSTFIELDS => $request->getContent(),
+			CURLOPT_HEADER => FALSE,
+			CURLOPT_HEADERFUNCTION => function($curl, $line) use (& $responseHeaders) {
+				if ($responseHeaders === NULL) {
+					$responseHeaders = [];
+					# and skip 1st line, it is HTTP code
+
+				} elseif ($line !== "\r\n") {
+					list($name, $value) = explode(':', $line, 2);
+					$responseHeaders[trim($name)] = trim($value);
+				}
+
+				return strlen($line);
+			},
 		];
 
 		if (!$this->curl) {
@@ -85,31 +99,22 @@ protected function process(Request $request)
 			throw new BadResponseException('Setting cURL options failed: ' . curl_error($this->curl), curl_errno($this->curl));
 		}
 
-		$result = curl_exec($this->curl);
-		if ($result === FALSE) {
+		$responseHeaders = NULL;
+		$content = curl_exec($this->curl);
+		if ($content === FALSE) {
 			throw new BadResponseException(curl_error($this->curl), curl_errno($this->curl));
 		}
 
-		$headersLength = curl_getinfo($this->curl, CURLINFO_HEADER_SIZE);
-		if ($headersLength === FALSE) {
-			throw new BadResponseException(curl_error($this->curl), curl_errno($this->curl));
+		if (!is_array($responseHeaders)) {
+			throw new BadResponseException('Response headers were not fetched.');
 		}
 
 		$code = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
 		if ($code === FALSE) {
 			throw new BadResponseException('HTTP status code is missing:' . curl_error($this->curl), curl_errno($this->curl));
 		}
 
-		$headersStr = trim(substr($result, 0, $headersLength));
-		$content = (string) substr($result, $headersLength);
-
-		$headers = [];
-		foreach (array_slice(explode("\r\n", $headersStr), 1) as $header) {
-			list($name, $value) = explode(': ', $header);
-			$headers[$name] = $value;
-		}
-
-		return new Response($code, $headers, $content);
+		return new Response($code, $responseHeaders, $content);
 	}
 
 }