summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-09-04 08:08:48 +0200
committerGitHub <noreply@github.com>2019-09-04 08:08:48 +0200
commitb7301f40ddc7d2c047ab0feb467821c183f9a5db (patch)
tree3996a53f5e74b19893bb472009bac1cdd9ae0157 /lib
parent102b1e170cd3a80fb9ea1b88acbba8bbf0da8c8f (diff)
parent773778dd8ce6a483539414add1d0a440233e5cad (diff)
downloadnextcloud-server-b7301f40ddc7d2c047ab0feb467821c183f9a5db.tar.gz
nextcloud-server-b7301f40ddc7d2c047ab0feb467821c183f9a5db.zip
Merge pull request #16972 from nextcloud/enh/default_client_timeout
Set a default request timeout
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Http/Client/Client.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Http/Client/Client.php b/lib/private/Http/Client/Client.php
index 993b83917fd..28694f38585 100644
--- a/lib/private/Http/Client/Client.php
+++ b/lib/private/Http/Client/Client.php
@@ -63,6 +63,7 @@ class Client implements IClient {
$defaults = [
RequestOptions::PROXY => $this->getProxyUri(),
RequestOptions::VERIFY => $this->getCertBundle(),
+ RequestOptions::TIMEOUT => 30,
];
$options = array_merge($defaults, $options);