Merge branch 'hotfix/184' into develop

Forward port #184

Author: michalbundyra

CHANGELOG.md

@@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#184](https://github.com/zendframework/zend-http/pull/184) fixes responses for request through the proxy with `HTTP/1.1 200 Connection established` header. 
 
 ## 2.10.0 - 2019-02-19
 

src/Client/Adapter/Curl.php

@@ -494,7 +494,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = [], $body =
 
         // cURL automatically handles Proxy rewrites, remove the "HTTP/1.0 200 Connection established" string:
         $responseHeaders = preg_replace(
-            "/HTTP\/1.0\s*200\s*Connection\s*established\\r\\n\\r\\n/",
+            "/HTTP\/1.[01]\s*200\s*Connection\s*established\\r\\n\\r\\n/",
             '',
             $responseHeaders
         );

test/Client/CurlTest.php

@@ -514,4 +514,24 @@ public function testTimeoutWithStream()
         }
         $this->assertNotNull($error, 'Failed to detect timeout in cURL adapter');
     }
+
+    /**
+     * @see https://github.com/zendframework/zend-http/pull/184
+     *
+     */
+    public function testMustRemoveProxyConnectionEstablishedLine()
+    {
+        $this->client->setUri($this->baseuri . 'testProxyResponse.php');
+
+        $adapter = new Adapter\Curl();
+
+        $this->client->setAdapter($adapter);
+        $this->client->setMethod('GET');
+        $this->client->send();
+
+        $response = $this->client->getResponse();
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('work', $response->getBody());
+    }
 }

test/Client/_files/testProxyResponse.php

@@ -0,0 +1,8 @@
+<?php
+
+echo "HTTP/1.1 200 Connection established\r\n\r\n";
+echo "HTTP/1.1 200 OK\r\n";
+echo "content-type: text/plain;charset=UTF-8\r\n";
+echo "server: Server\r\n";
+echo "\r\n";
+echo "work";