Merge branch 'hotfix/4555'

Close zendframework#4555
vicular · Jul 23, 2013 · a643329 · a643329
2 parents 069851d + 271046b
commit a643329
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php
@@ -427,6 +427,14 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
             $this->response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $this->response);
         }
 
+        // cURL can automatically handle content encoding; prevent double-decoding from occurring
+        if (isset($this->config['curloptions'][CURLOPT_ENCODING])
+            && '' == $this->config['curloptions'][CURLOPT_ENCODING]
+            && stripos($this->response, "Content-Encoding: gzip\r\n")
+        ) {
+            $this->response = str_ireplace("Content-Encoding: gzip\r\n", '', $this->response);
+        }
+
         // Eliminate multiple HTTP responses.
         do {
             $parts  = preg_split('|(?:\r?\n){2}|m', $this->response, 2);

diff --git a/tests/ZendTest/Http/Client/CurlTest.php b/tests/ZendTest/Http/Client/CurlTest.php
@@ -347,4 +347,22 @@ public function testAuthorizeHeader()
 
         $this->assertContains($header, $curlInfo['request_header'], 'Expecting valid basic authorization header');
     }
+
+    /**
+     * @group 4555
+     */
+    public function testResponseDoesNotDoubleDecodeGzippedBody()
+    {
+        $this->client->setUri($this->baseuri . 'testCurlGzipData.php');
+        $adapter = new Adapter\Curl();
+        $adapter->setOptions(array(
+            'curloptions' => array(
+                CURLOPT_ENCODING => '',
+            ),
+        ));
+        $this->client->setAdapter($adapter);
+        $this->client->setMethod('GET');
+        $this->client->send();
+        $this->assertEquals('Success', $this->client->getResponse()->getBody());
+    }
 }
diff --git a/tests/ZendTest/Http/Client/_files/testCurlGzipData.php b/tests/ZendTest/Http/Client/_files/testCurlGzipData.php
@@ -0,0 +1,3 @@
+<?php
+header('Content-Encoding: gzip');
+echo gzcompress('Success');