From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 20 May 2020 09:09:46 +0000 (+0200)
Subject: Revert "Compress the appstore requests by default"
X-Git-Tag: v20.0.0beta1~520^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F21054%2Fhead;p=nextcloud-server.git

Revert "Compress the appstore requests by default"

This reverts commit 6ffde128ad17a1ebe38f8d18b21a37d01b47c46b.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

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