From dab86802f082d49ce3b9e87a821109c80ea7f32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20H=C3=A4rdeman?= Date: Sat, 21 Aug 2021 17:21:12 +0200 Subject: [PATCH] [snappymail] Fix ACPU support Fix ACPU support and update configuration file comments to reflect the ACP -> ACPU change that was introduced earlier. --- .docker/release/files/usr/local/include/application.ini | 4 ++-- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 2 +- .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index f70bfcf4a..b804664fb 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -252,7 +252,7 @@ enable = On ; Additional caching key. If changed, cache is purged index = "v1" -; Can be: files, APC, memcache, redis (beta) +; Can be: files, APCU, memcache, redis (beta) fast_cache_driver = "files" ; Additional caching key. If changed, fast cache is purged @@ -356,4 +356,4 @@ dev_password = "" [version] current = "1.14.0" -saved = "Wed, 08 Apr 2020 16:37:27 +0000" \ No newline at end of file +saved = "Wed, 08 Apr 2020 16:37:27 +0000" diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 0c49038b8..e04b4d8b3 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -690,7 +690,7 @@ class Actions \MailSo\Base\Utils::FunctionExistsAndEnabled(array( 'apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache')): - $oDriver = new \MailSo\Cache\Drivers\APC($sKey); + $oDriver = new \MailSo\Cache\Drivers\APCU($sKey); break; case ('MEMCACHE' === $sDriver || 'MEMCACHED' === $sDriver) && diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index df3f2fe63..f7276d522 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -301,7 +301,7 @@ Enables caching in the system'), 'index' => array('v1', 'Additional caching key. If changed, cache is purged'), - 'fast_cache_driver' => array('files', 'Can be: files, APC, memcache, redis (beta)'), + 'fast_cache_driver' => array('files', 'Can be: files, APCU, memcache, redis (beta)'), 'fast_cache_index' => array('v1', 'Additional caching key. If changed, fast cache is purged'), 'http' => array(true, 'Browser-level cache. If enabled, caching is maintainted without using files'),