Browse Source

Revert "Compress the appstore requests by default"

This reverts commit 6ffde128ad.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
tags/v20.0.0beta1
Morris Jobke 4 years ago
parent
commit
8123737a40
No account linked to committer's email address

+ 3
- 2
lib/private/App/AppStore/Fetcher/Fetcher.php View File

@@ -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();

+ 5
- 42
tests/lib/App/AppStore/Fetcher/FetcherBase.php View File

@@ -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);

Loading…
Cancel
Save