nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Changes after code review. 

Signed-off-by: Dominik Fuchß <develop@fuchss.org>
This commit is contained in:
Dominik Fuchß 2023-06-11 15:16:38 +02:00 committed by Daniel
parent c3ba871f36
commit a4a57409db
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.sample.php
View File

@ -290,9 +290,9 @@ $CONFIG = [
'session_lifetime' => 60 * 60 * 24,
/**
* The timeout for requests to remote servers (e.g., needed for federated shares).
* The timeout in seconds for requests to servers made by the DAV component (e.g., needed for federated shares).
*/
'remote_curl_timeout' => 30,
'davstorage.request_timeout' => 30,
/**
* `true` enabled a relaxed session timeout, where the session timeout would no longer be

9
lib/private/Files/Storage/DAV.php
View File

@ -93,6 +93,9 @@ class DAV extends Common {
protected LoggerInterface $logger;
protected IEventLogger $eventLogger;
/** @var int */
private $timeout;
/**
* @param array $params
* @throws \Exception
@ -135,6 +138,8 @@ class DAV extends Common {
}
$this->logger = \OC::$server->get(LoggerInterface::class);
$this->eventLogger = \OC::$server->get(IEventLogger::class);
// This timeout value will be used for the download and upload of files
$this->timeout = \OC::$server->getConfig()->getSystemValueInt('davstorage.request_timeout', 30);
}
protected function init() {
@ -375,7 +380,7 @@ class DAV extends Common {
'auth' => [$this->user, $this->password],
'stream' => true,
// set download timeout for users with slow connections or large files
'timeout' => \OC::$server->getConfig()->getSystemValueInt('remote_curl_timeout', 30)
'timeout' => $this->timeout
]);
} catch (\GuzzleHttp\Exception\ClientException $e) {
if ($e->getResponse() instanceof ResponseInterface
@ -534,7 +539,7 @@ class DAV extends Common {
'body' => $source,
'auth' => [$this->user, $this->password],
// set upload timeout for users with slow connections or large files
'timeout' => \OC::$server->getConfig()->getSystemValueInt('remote_curl_timeout', 30)
'timeout' => $this->timeout
]);
$this->removeCachedFile($target);