Skip to content

Commit 7525f7e

Browse files
authored
Merge pull request #61413 from nextcloud/fix/use-cappedmemorycache-for-userconfig
fix: Use a CappedMemoryCache for UserConfig to avoid memory exhaustion
2 parents 5ef39f8 + e9866ef commit 7525f7e

7 files changed

Lines changed: 355 additions & 285 deletions

File tree

lib/composer/composer/autoload_classmap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,7 @@
13661366
'OC\\Config\\ConfigManager' => $baseDir . '/lib/private/Config/ConfigManager.php',
13671367
'OC\\Config\\PresetManager' => $baseDir . '/lib/private/Config/PresetManager.php',
13681368
'OC\\Config\\UserConfig' => $baseDir . '/lib/private/Config/UserConfig.php',
1369+
'OC\\Config\\UserConfigEntry' => $baseDir . '/lib/private/Config/UserConfigEntry.php',
13691370
'OC\\Console\\Application' => $baseDir . '/lib/private/Console/Application.php',
13701371
'OC\\Console\\TimestampFormatter' => $baseDir . '/lib/private/Console/TimestampFormatter.php',
13711372
'OC\\ContactsManager' => $baseDir . '/lib/private/ContactsManager.php',

lib/composer/composer/autoload_static.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,6 +1407,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
14071407
'OC\\Config\\ConfigManager' => __DIR__ . '/../../..' . '/lib/private/Config/ConfigManager.php',
14081408
'OC\\Config\\PresetManager' => __DIR__ . '/../../..' . '/lib/private/Config/PresetManager.php',
14091409
'OC\\Config\\UserConfig' => __DIR__ . '/../../..' . '/lib/private/Config/UserConfig.php',
1410+
'OC\\Config\\UserConfigEntry' => __DIR__ . '/../../..' . '/lib/private/Config/UserConfigEntry.php',
14101411
'OC\\Console\\Application' => __DIR__ . '/../../..' . '/lib/private/Console/Application.php',
14111412
'OC\\Console\\TimestampFormatter' => __DIR__ . '/../../..' . '/lib/private/Console/TimestampFormatter.php',
14121413
'OC\\ContactsManager' => __DIR__ . '/../../..' . '/lib/private/ContactsManager.php',

0 commit comments

Comments
 (0)