Forward-port of PR php-vcr#294

[Curl] Add \r\n to HTTP status and headers to mimic what curl does

Author: clemherreman

src/VCR/Util/CurlHelper.php

@@ -59,7 +59,7 @@ public static function handleOutput(Response $response, array $curlOptions, $ch)
  if (isset($curlOptions[CURLOPT_HEADERFUNCTION])) {
  $headerList = array(HttpUtil::formatAsStatusString($response));
  $headerList = array_merge($headerList, HttpUtil::formatHeadersForCurl($response->getHeaders()));
- $headerList[] = '';
+ $headerList[] = "\r\n";
  foreach ($headerList as $header) {
  call_user_func($curlOptions[CURLOPT_HEADERFUNCTION], $ch, $header);
  }

src/VCR/Util/HttpUtil.php

@@ -91,14 +91,14 @@ public static function parseRawHeader($rawHeader)
  * Returns a list of headers from a key/value paired array.
  *
  * @param array $headers Headers as key/value pairs.
- * @return array List of headers ['Content-Type: text/html', '...'].
+ * @return array List of headers ["Content-Type: text/html\r\n", '...'].
  */
  public static function formatHeadersForCurl(array $headers)
  {
  $curlHeaders = array();
 
  foreach ($headers as $key => $value) {
- $curlHeaders[] = $key . ': ' . $value;
+ $curlHeaders[] = $key . ': ' . $value . "\r\n";
  }
 
  return $curlHeaders;
@@ -108,25 +108,30 @@ public static function formatHeadersForCurl(array $headers)
  * Returns a HTTP status line from specified response.
  *
  * @param Response $response
+ *
  * @return string HTTP status line.
  */
  public static function formatAsStatusString(Response $response)
  {
  return 'HTTP/' . $response->getHttpVersion()
- . ' ' . $response->getStatusCode()
- . ' ' . $response->getStatusMessage();
+ . ' ' . $response->getStatusCode()
+ . ' ' . $response->getStatusMessage()
+ . "\r\n";
  }
 
  /**
  * Returns a HTTP status line with headers from specified response.
  *
  * @param Response $response
+ *
  * @return string HTTP status line.
  */
  public static function formatAsStatusWithHeadersString(Response $response)
  {
  $headers = self::formatHeadersForCurl($response->getHeaders());
  array_unshift($headers, self::formatAsStatusString($response));
- return join("\r\n", $headers) . "\r\n\r\n";
+
+ // Only one \r\n, as self::formatHeadersForCurl() returns an empty line as the last header already;
+ return join('', $headers) . "\r\n";
  }
 }

tests/VCR/Util/CurlHelperTest.php

@@ -252,9 +252,9 @@ public function testHandleOutputHeaderFunction()
  CurlHelper::handleOutput($response, $curlOptions, curl_init());
 
  $expected = array(
- 'HTTP/1.1 200 OK',
- 'Content-Length: 0',
- ''
+ "HTTP/1.1 200 OK\r\n",
+ "Content-Length: 0\r\n",
+ "\r\n"
  );
  $this->assertEquals($expected, $actualHeaders);
  }