upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 00:02:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Revert "Compress the appstore requests by default"

Browse source 
This reverts commit 6ffde128ad.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-05-20 11:09:46 +02:00
parent 8bcd1c31da
commit 8123737a40
No known key found for this signature in database
GPG key ID: FE03C3A163FEDE68
2 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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