diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-20 11:09:46 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-05-20 13:37:28 +0200 |
| commit | 8123737a406a969b6cb8cce5f58355b7b8a9e053 (patch) | |
| tree | c3cb08c2c3b29bd257af991a0736326e64df8b0c | |
| parent | 8bcd1c31da7a02e78435aa49508ed3787b11867d (diff) | |
| download | nextcloud-server-8123737a406a969b6cb8cce5f58355b7b8a9e053.tar.gz nextcloud-server-8123737a406a969b6cb8cce5f58355b7b8a9e053.zip | |
Revert "Compress the appstore requests by default"
This reverts commit 6ffde128ad17a1ebe38f8d18b21a37d01b47c46b.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/Fetcher.php | 5 | ||||
| -rw-r--r-- | tests/lib/App/AppStore/Fetcher/FetcherBase.php | 47 |
2 files changed, 8 insertions, 44 deletions
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index c109bacf135..bb39637891f 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -98,11 +98,12 @@ abstract class Fetcher { $options = [ 'timeout' => 10, - 'headers' => ['Accept-Encoding' => 'gzip'], ]; if ($ETag !== '') { - $options['headers']['If-None-Match'] = $ETag; + $options['headers'] = [ + 'If-None-Match' => $ETag, + ]; } $client = $this->clientService->newClient(); diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 45f3f22b9d4..2e04f22760e 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -249,15 +249,7 @@ abstract class FetcherBase extends TestCase { $client ->expects($this->once()) ->method('get') - ->with( - $this->equalTo($this->endpoint), - $this->equalTo([ - 'timeout' => 10, - 'headers' => [ - 'Accept-Encoding' => 'gzip', - ] - ]) - ) + ->with($this->endpoint) ->willReturn($response); $response ->expects($this->once()) @@ -350,15 +342,7 @@ abstract class FetcherBase extends TestCase { $client ->expects($this->once()) ->method('get') - ->with( - $this->equalTo($this->endpoint), - $this->equalTo([ - 'timeout' => 10, - 'headers' => [ - 'Accept-Encoding' => 'gzip', - ] - ]) - ) + ->with($this->endpoint) ->willReturn($response); $response ->expects($this->once()) @@ -446,15 +430,7 @@ abstract class FetcherBase extends TestCase { $client ->expects($this->once()) ->method('get') - ->with( - $this->equalTo($this->endpoint), - $this->equalTo([ - 'timeout' => 10, - 'headers' => [ - 'Accept-Encoding' => 'gzip', - ] - ]) - ) + ->with($this->endpoint) ->willReturn($response); $response ->expects($this->once()) @@ -519,15 +495,7 @@ abstract class FetcherBase extends TestCase { $client ->expects($this->once()) ->method('get') - ->with( - $this->equalTo($this->endpoint), - $this->equalTo([ - 'timeout' => 10, - 'headers' => [ - 'Accept-Encoding' => 'gzip', - ] - ]) - ) + ->with($this->endpoint) ->willThrowException(new \Exception()); $this->assertSame([], $this->fetcher->get()); @@ -584,8 +552,7 @@ abstract class FetcherBase extends TestCase { $this->equalTo([ 'timeout' => 10, 'headers' => [ - 'Accept-Encoding' => 'gzip', - 'If-None-Match' => '"myETag"', + 'If-None-Match' => '"myETag"' ] ]) )->willReturn($response); @@ -657,7 +624,6 @@ abstract class FetcherBase extends TestCase { $this->equalTo([ 'timeout' => 10, 'headers' => [ - 'Accept-Encoding' => 'gzip', 'If-None-Match' => '"myETag"', ] ]) @@ -744,9 +710,6 @@ abstract class FetcherBase extends TestCase { $this->equalTo($this->endpoint), $this->equalTo([ 'timeout' => 10, - 'headers' => [ - 'Accept-Encoding' => 'gzip', - ], ]) ) ->willReturn($response); |