Merge pull request #35425 from nextcloud/bumpMinimumDesktopClientForWebdav

minimum desktop client that is supported is 2.3.0
pull/35107/head
Simon L 2022-11-28 15:34:32 +07:00 committed by GitHub
commit cd7cec587e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

@ -64,7 +64,7 @@ class BlockLegacyClientPlugin extends ServerPlugin {
return; return;
} }
$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.0.0'); $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.3.0');
// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
// "mirall/%1" for older releases // "mirall/%1" for older releases

@ -82,7 +82,7 @@ class BlockLegacyClientPluginTest extends TestCase {
$this->config $this->config
->expects($this->once()) ->expects($this->once())
->method('getSystemValue') ->method('getSystemValue')
->with('minimum.supported.desktop.version', '2.0.0') ->with('minimum.supported.desktop.version', '2.3.0')
->willReturn('1.7.0'); ->willReturn('1.7.0');
$this->blockLegacyClientVersionPlugin->beforeHandler($request); $this->blockLegacyClientVersionPlugin->beforeHandler($request);
@ -117,7 +117,7 @@ class BlockLegacyClientPluginTest extends TestCase {
$this->config $this->config
->expects($this->once()) ->expects($this->once())
->method('getSystemValue') ->method('getSystemValue')
->with('minimum.supported.desktop.version', '2.0.0') ->with('minimum.supported.desktop.version', '2.3.0')
->willReturn('1.7.0'); ->willReturn('1.7.0');
$this->blockLegacyClientVersionPlugin->beforeHandler($request); $this->blockLegacyClientVersionPlugin->beforeHandler($request);

@ -140,7 +140,7 @@ $CONFIG = [
/** /**
* Enable persistent connexions to the database. * Enable persistent connexions to the database.
* This setting uses the "persistent" option from doctrine dbal, wich in turns * This setting uses the "persistent" option from doctrine dbal, wich in turns
* uses the PDO::ATTR_PERSISTENT option from de pdo driver. * uses the PDO::ATTR_PERSISTENT option from de pdo driver.
*/ */
'dbpersistent' => '', 'dbpersistent' => '',
@ -675,16 +675,16 @@ $CONFIG = [
* and a maximum time for trash bin retention. * and a maximum time for trash bin retention.
* *
* Minimum time is the number of days a file will be kept, after which it * Minimum time is the number of days a file will be kept, after which it
* _may be_ deleted. A file may be deleted after the minimum number of days * _may be_ deleted. A file may be deleted after the minimum number of days
* is expired if space is needed. The file will not be deleted if space is * is expired if space is needed. The file will not be deleted if space is
* not needed. * not needed.
* *
* Whether "space is needed" depends on whether a user quota is defined or not: * Whether "space is needed" depends on whether a user quota is defined or not:
* *
* * If no user quota is defined, the available space on the Nextcloud data * * If no user quota is defined, the available space on the Nextcloud data
* partition sets the limit for the trashbin * partition sets the limit for the trashbin
* (issues: see https://github.com/nextcloud/server/issues/28451). * (issues: see https://github.com/nextcloud/server/issues/28451).
* * If a user quota is defined, 50% of the user's remaining quota space sets * * If a user quota is defined, 50% of the user's remaining quota space sets
* the limit for the trashbin. * the limit for the trashbin.
* *
* Maximum time is the number of days at which it is _guaranteed * Maximum time is the number of days at which it is _guaranteed
@ -1123,7 +1123,7 @@ $CONFIG = [
* Number of all preview requests being processed concurrently, * Number of all preview requests being processed concurrently,
* including previews that need to be newly generated, and those that have * including previews that need to be newly generated, and those that have
* been generated. * been generated.
* *
* This should be greater than 'preview_concurrency_new'. * This should be greater than 'preview_concurrency_new'.
* If unspecified, defaults to twice the value of 'preview_concurrency_new'. * If unspecified, defaults to twice the value of 'preview_concurrency_new'.
*/ */
@ -1131,10 +1131,10 @@ $CONFIG = [
/** /**
* Number of new previews that are being concurrently generated. * Number of new previews that are being concurrently generated.
* *
* Depending on the max preview size set by 'preview_max_x' and 'preview_max_y', * Depending on the max preview size set by 'preview_max_x' and 'preview_max_y',
* the generation process can consume considerable CPU and memory resources. * the generation process can consume considerable CPU and memory resources.
* It's recommended to limit this to be no greater than the number of CPU cores. * It's recommended to limit this to be no greater than the number of CPU cores.
* If unspecified, defaults to the number of CPU cores, or 4 if that cannot * If unspecified, defaults to the number of CPU cores, or 4 if that cannot
* be determined. * be determined.
*/ */
@ -1904,15 +1904,15 @@ $CONFIG = [
* The minimum Nextcloud desktop client version that will be allowed to sync with * The minimum Nextcloud desktop client version that will be allowed to sync with
* this server instance. All connections made from earlier clients will be denied * this server instance. All connections made from earlier clients will be denied
* by the server. Defaults to the minimum officially supported Nextcloud desktop * by the server. Defaults to the minimum officially supported Nextcloud desktop
* clientversion at the time of release of this server version. * client version at the time of release of this server version.
* *
* When changing this, note that older unsupported versions of the Nextcloud desktop * When changing this, note that older unsupported versions of the Nextcloud desktop
* client may not function as expected, and could lead to permanent data loss for * client may not function as expected, and could lead to permanent data loss for
* clients or other unexpected results. * clients or other unexpected results.
* *
* Defaults to ``2.0.0`` * Defaults to ``2.3.0``
*/ */
'minimum.supported.desktop.version' => '2.0.0', 'minimum.supported.desktop.version' => '2.3.0',
/** /**
* Option to allow local storage to contain symlinks. * Option to allow local storage to contain symlinks.