Merge pull request php-curl-class#749 from zachborboa/master

zachborboa · web-flow · commit 918ce7bc60fe · 2022-12-12T06:18:41.000-08:00
Ensure string response before gzip decode
diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php
@@ -1022,14 +1022,12 @@ public function setDefaultDecoder($mixed = 'json')
     {
         if ($mixed === false) {
             $this->defaultDecoder = false;
+        } elseif ($mixed === 'json') {
+            $this->defaultDecoder = '\Curl\Decoder::decodeJson';
+        } elseif ($mixed === 'xml') {
+            $this->defaultDecoder = '\Curl\Decoder::decodeXml';
         } elseif (is_callable($mixed)) {
             $this->defaultDecoder = $mixed;
-        } else {
-            if ($mixed === 'json') {
-                $this->defaultDecoder = '\Curl\Decoder::decodeJson';
-            } elseif ($mixed === 'xml') {
-                $this->defaultDecoder = '\Curl\Decoder::decodeXml';
-            }
         }
     }
 
@@ -2155,7 +2153,8 @@ private function parseResponse($response_headers, $raw_response)
             }
         }
 
-        if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip') {
+        if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&
+            is_string($response)) {
             // Use @ to suppress message "Warning gzdecode(): data error".
             $decoded_response = @gzdecode($response);
             if ($decoded_response !== false) {
diff --git a/tests/PHPCurlClass/PHPCurlClassTest.php b/tests/PHPCurlClass/PHPCurlClassTest.php
@@ -4411,4 +4411,25 @@ public function testGzipDecodingFailureWithoutWarning()
         $this->assertEquals('gzip', $test->curl->responseHeaders['content-encoding']);
         $this->assertEquals('<html><body>not gzip-encoded</body></html>', $test->curl->response);
     }
+
+    public function testGzipDecodingNonStringResponseWithoutError()
+    {
+        $test = new Test();
+        $test->curl->setDefaultDecoder(function () {
+            $response = new \stdClass();
+            $response->{'abc'} = 'foo';
+            $response->{'123'} = 'bar';
+            return $response;
+        });
+        $test->server('json_response', 'POST', [
+            'headers' => [
+                'content-type: text/html; charset=utf-8',
+                'content-encoding: gzip',
+            ],
+        ]);
+        $this->assertEquals('text/html; charset=utf-8', $test->curl->responseHeaders['content-type']);
+        $this->assertEquals('gzip', $test->curl->responseHeaders['content-encoding']);
+        $this->assertEquals('foo', $test->curl->response->{'abc'});
+        $this->assertEquals('bar', $test->curl->response->{'123'});
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1022,14 +1022,12 @@ public function setDefaultDecoder($mixed = 'json')`
`1022`	`1022`	`{`
`1023`	`1023`	`if ($mixed === false) {`
`1024`	`1024`	`$this->defaultDecoder = false;`
	`1025`	`+ } elseif ($mixed === 'json') {`
	`1026`	`+ $this->defaultDecoder = '\Curl\Decoder::decodeJson';`
	`1027`	`+ } elseif ($mixed === 'xml') {`
	`1028`	`+ $this->defaultDecoder = '\Curl\Decoder::decodeXml';`
`1025`	`1029`	`} elseif (is_callable($mixed)) {`
`1026`	`1030`	`$this->defaultDecoder = $mixed;`
`1027`		`- } else {`
`1028`		`- if ($mixed === 'json') {`
`1029`		`- $this->defaultDecoder = '\Curl\Decoder::decodeJson';`
`1030`		`- } elseif ($mixed === 'xml') {`
`1031`		`- $this->defaultDecoder = '\Curl\Decoder::decodeXml';`
`1032`		`- }`
`1033`	`1031`	`}`
`1034`	`1032`	`}`
`1035`	`1033`
`@@ -2155,7 +2153,8 @@ private function parseResponse($response_headers, $raw_response)`
`2155`	`2153`	`}`
`2156`	`2154`	`}`
`2157`	`2155`
`2158`		`- if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip') {`
	`2156`	`+ if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&`
	`2157`	`+ is_string($response)) {`
`2159`	`2158`	`// Use @ to suppress message "Warning gzdecode(): data error".`
`2160`	`2159`	`$decoded_response = @gzdecode($response);`
`2161`	`2160`	`if ($decoded_response !== false) {`