mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21387 from nextcloud/backport/21380/stable19 

[stable19] Increase timeout of the appstore requests
This commit is contained in:
Joas Schilling 2020-07-03 10:04:55 +02:00 committed by GitHub
parent a5b279a488 9d541ccfd1
commit d203f8f985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/App/AppStore/Fetcher/Fetcher.php
View File

@ -97,7 +97,7 @@ abstract class Fetcher {
} }
$options = [ $options = [
'timeout' => 10, 'timeout' => 60,
'headers' => ['Accept-Encoding' => 'gzip'], 'headers' => ['Accept-Encoding' => 'gzip'],
]; ];

14
tests/lib/App/AppStore/Fetcher/FetcherBase.php
View File

@ -252,7 +252,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
] ]
@ -353,7 +353,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
] ]
@ -449,7 +449,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
] ]
@ -522,7 +522,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
] ]
@ -582,7 +582,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
'If-None-Match' => '"myETag"', 'If-None-Match' => '"myETag"',
@ -655,7 +655,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
'If-None-Match' => '"myETag"', 'If-None-Match' => '"myETag"',
@ -743,7 +743,7 @@ abstract class FetcherBase extends TestCase {
->with( ->with(
$this->equalTo($this->endpoint), $this->equalTo($this->endpoint),
$this->equalTo([ $this->equalTo([
'timeout' => 10, 'timeout' => 60,
'headers' => [ 'headers' => [
'Accept-Encoding' => 'gzip', 'Accept-Encoding' => 'gzip',
], ],