mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 02:22:57 +01:00
Code Issues Releases Wiki Activity

Adding Accept-Encoding header now sets CURLOPT_ENCODING - fixes #217

Browse Source
This commit is contained in:
David Abdemoulaie 2013-01-23 20:44:50 -06:00
parent 273004fac9
commit 6c19fca9d1
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Guzzle/Http/Curl/CurlHandle.php
View File

@ -72,6 +72,13 @@ class CurlHandle
CURLOPT_SSL_VERIFYHOST => 2 CURLOPT_SSL_VERIFYHOST => 2
); );
// Add CURLOPT_ENCODING if Accept-Encoding header is provided
if ($acceptEncodingHeader = $request->getHeader('Accept-Encoding')) {
$curlOptions[CURLOPT_ENCODING] = (string) $acceptEncodingHeader;
// Let cURL set the Accept-Encoding header, prevents duplicate values
$request->removeHeader('Accept-Encoding');
}
// Enable the progress function if the 'progress' param was set // Enable the progress function if the 'progress' param was set
if ($requestCurlOptions->get('progress')) { if ($requestCurlOptions->get('progress')) {
$curlOptions[CURLOPT_PROGRESSFUNCTION] = array($mediator, 'progress'); $curlOptions[CURLOPT_PROGRESSFUNCTION] = array($mediator, 'progress');

18
tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
View File

@ -959,4 +959,22 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
$received = $this->getServer()->getReceivedRequests(false); $received = $this->getServer()->getReceivedRequests(false);
$this->assertContainsIns('expect: 100-continue', $received[0]); $this->assertContainsIns('expect: 100-continue', $received[0]);
} }
public function testSetsCurloptEncodingWhenAcceptEncodingHeaderIsSet()
{
$this->getServer()->flush();
$this->getServer()->enqueue("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\ndata");
$client = new Client($this->getServer()->getUrl());
$request = $client->get('/', array(
'Accept' => 'application/json',
'Accept-Encoding' => 'gzip, deflate',
));
$this->updateForHandle($request);
$request->send();
$options = $this->requestHandle->getOptions()->getAll();
$this->assertSame('gzip, deflate', $options[CURLOPT_ENCODING]);
$received = $this->getServer()->getReceivedRequests(false);
$this->assertContainsIns('accept: application/json', $received[0]);
$this->assertContainsIns('accept-encoding: gzip, deflate', $received[0]);
}
} }