Merge branch 'curl-client-18'

Author: mekras

src/Client.php

@@ -254,7 +254,12 @@ private function createHeaders(RequestInterface $request, array $options)
         $curlHeaders = [];
         $headers = array_keys($request->getHeaders());
         foreach ($headers as $name) {
-            if (strtolower($name) === 'content-length') {
+            $header = strtolower($name);
+            if ('expect' === $header) {
+                // curl-client does not support "Expect-Continue", so dropping "expect" headers
+                continue;
+            }
+            if ('content-length' === $header) {
                 $values = [0];
                 if (array_key_exists(CURLOPT_POSTFIELDS, $options)) {
                     $values = [strlen($options[CURLOPT_POSTFIELDS])];
@@ -266,6 +271,11 @@ private function createHeaders(RequestInterface $request, array $options)
                 $curlHeaders[] = $name . ': ' . $value;
             }
         }
+        /*
+         * curl-client does not support "Expect-Continue", but cURL adds "Expect" header by default.
+         * We can not suppress it, but we can set it to empty.
+         */
+        $curlHeaders []= 'Expect:';
 
         return $curlHeaders;
     }

tests/ClientTest.php

@@ -0,0 +1,33 @@
+<?php
+namespace Http\Client\Curl\Tests;
+
+use Http\Client\Curl\Client;
+use Zend\Diactoros\Request;
+
+/**
+ * Tests for Http\Client\Curl\Client
+ *
+ * @covers Http\Client\Curl\Client
+ */
+class ClientTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * "Expect" header should be empty
+     *
+     * @link https://github.com/php-http/curl-client/issues/18
+     */
+    public function testExpectHeader()
+    {
+        $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()
+            ->setMethods(['__none__'])->getMock();
+
+        $createHeaders = new \ReflectionMethod(Client::class, 'createHeaders');
+        $createHeaders->setAccessible(true);
+
+        $request = new Request();
+
+        $headers = $createHeaders->invoke($client, $request, []);
+
+        static::assertContains('Expect:', $headers);
+    }
+}