Fix bug where it wasn't possible to store more that 2MB objects in memcache/apc (#5452)

Added memcache_max_allowed_packet and apc_max_allowed_packet settings

CHANGELOG

@@ -59,6 +59,8 @@ CHANGELOG Roundcube Webmail
 - Enigma: Fix key search with keyword containing non-ascii characters (#5459)
 - Fix bug where deleting folders with subfolders could fail in some cases (#5466)
 - Fix bug where IMAP password could be exposed via error message (#5472)
+- Fix bug where it wasn't possible to store more that 2MB objects in memcache/apc,
+  Added memcache_max_allowed_packet and apc_max_allowed_packet settings (#5452)
 
 RELEASE 1.2.2
 -------------

config/defaults.inc.php

@@ -308,6 +308,40 @@ $config['ldap_cache'] = 'db';
 $config['ldap_cache_ttl'] = '10m';
 
 
+// ----------------------------------
+// CACHE(S)
+// ----------------------------------
+
+// Use these hosts for accessing memcached
+// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
+$config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
+
+// Controls the use of a persistent connections to memcache servers
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_pconnect'] = true;
+
+// Value in seconds which will be used for connecting to the daemon
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_timeout'] = 1;
+
+// Controls how often a failed server will be retried (value in seconds).
+// Setting this parameter to -1 disables automatic retry.
+// See http://php.net/manual/en/memcache.addserver.php
+$config['memcache_retry_interval'] = 15;
+
+// use these hosts for accessing Redis.
+// Currently only one host is supported. cluster support may come in a future release.
+// You can pass 4 fields, host, port, database and password.
+// Unset fields will be set to the default values host=127.0.0.1, port=6379, database=0, password=  (empty)
+$config['redis_hosts'] = null; // e.g. array( 'localhost:6379' );  array( '192.168.1.1:6379:1:secret' );
+
+// Maximum size of an object in memcache (in bytes). Default: 2MB
+$config['memcache_max_allowed_packet'] = '2M';
+
+// Maximum size of an object in APC cache (in bytes). Default: 2MB
+$config['apc_max_allowed_packet'] = '2M';
+
+
 // ----------------------------------
 // SYSTEM
 // ----------------------------------
@@ -423,30 +457,6 @@ $config['session_path'] = null;
 // Setting this value to 'php' will use the default session save handler configured in PHP
 $config['session_storage'] = 'db';
 
-// Use these hosts for accessing memcached
-// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
-$config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );
-
-// Controls the use of a persistent connections to memcache servers
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_pconnect'] = true;
-
-// Value in seconds which will be used for connecting to the daemon
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_timeout'] = 1;
-
-// Controls how often a failed server will be retried (value in seconds).
-// Setting this parameter to -1 disables automatic retry.
-// See http://php.net/manual/en/memcache.addserver.php
-$config['memcache_retry_interval'] = 15;
-
-// use this for accessing redis
-// currently only one host is supported. cluster support may come in a future release.
-// you can pass 4 fields, host, port, database and password.
-// unset fields will be set to the default values host=127.0.0.1, port=6379, database=0, password=  (empty)
-
-$config['redis_hosts'] = null; // e.g. array( 'localhost:6379' );  array( '192.168.1.1:6379:1:secret' );
-
 // check client IP in session authorization
 $config['ip_check'] = false;
 

plugins/database_attachments/config.inc.php.dist

@@ -3,6 +3,10 @@
 // By default this plugin stores attachments in filesystem
 // and copies them into sql database.
 // You can change it to use 'memcache' or 'apc'.
+// -----------------------------------------------------------
+// WARNING: Remember to set max_allowed_packet in database or
+//          config to match with expected max attachment size.
+// -----------------------------------------------------------
 $config['database_attachments_cache'] = 'db';
 
 // Attachment data expires after specied TTL time in seconds (max.2592000).

plugins/enigma/lib/enigma_ui.php

@@ -547,7 +547,7 @@ class enigma_ui
         else if ($err = $_FILES['_file']['error']) {
             if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                 $this->rc->output->show_message('filesizeerror', 'error',
-                    array('size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize')))));
+                    array('size' => $this->rc->show_bytes(rcube_utils::max_upload_size())));
             } else {
                 $this->rc->output->show_message('fileuploaderror', 'error');
             }

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

@@ -562,7 +562,7 @@ class rcube_sieve_engine
                     if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                         $msg = $this->rc->gettext(array('name' => 'filesizeerror',
                             'vars' => array('size' =>
-                                $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+                                $this->rc->show_bytes(rcube_utils::max_upload_size()))));
                     }
                     else {
                         $this->errors['file'] = $this->plugin->gettext('fileuploaderror');

plugins/redundant_attachments/config.inc.php.dist

@@ -4,6 +4,10 @@
 // and copies them into sql database.
 // In environments with replicated database it is possible
 // to use memcache as a fallback when write-master is unavailable.
+// ------------------------------------------------------------
+// WARNING: Remember to also set memcache_max_allowed_packet in
+//          config to match with expected max attachment size.
+// ------------------------------------------------------------
 $config['redundant_attachments_memcache'] = false;
 
 // Attachment data expires after specified TTL time in seconds (max.2592000).

program/include/rcmail.php

@@ -2083,13 +2083,7 @@ class rcmail extends rcube
         }
 
         // find max filesize value
-        $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
+        $max_filesize = rcube_utils::max_upload_size();
-        $max_postsize = parse_bytes(ini_get('post_max_size'));
-
-        if ($max_postsize && $max_postsize < $max_filesize) {
-            $max_filesize = $max_postsize;
-        }
-
         if ($max_size && $max_size < $max_filesize) {
             $max_filesize = $max_size;
         }

program/lib/Roundcube/rcube_cache.php

@@ -645,16 +645,9 @@ class rcube_cache
                 }
                 $this->max_packet -= 2000;
             }
-            else if ($this->type == 'memcache') {
+            else {
-                if ($stats = $this->db->getStats()) {
+                $max_packet = rcube::get_instance()->config->get($this->type . '_max_allowed_packet');
-                    $remaining = $stats['limit_maxbytes'] - $stats['bytes'];
+                $this->max_packet = parse_bytes($max_packet) ?: $this->max_packet;
-                    $this->max_packet = min($remaining / 5, $this->max_packet);
-                }
-            }
-            else if ($this->type == 'apc' && function_exists('apc_sma_info')) {
-                if ($stats = apc_sma_info()) {
-                    $this->max_packet = min($stats['avail_mem'] / 5, $this->max_packet);
-                }
             }
         }
 

program/lib/Roundcube/rcube_cache_shared.php

@@ -632,16 +632,9 @@ class rcube_cache_shared
                 }
                 $this->max_packet -= 2000;
             }
-            else if ($this->type == 'memcache') {
+            else {
-                if ($stats = $this->db->getStats()) {
+                $max_packet = rcube::get_instance()->config->get($this->type . '_max_allowed_packet');
-                    $remaining = $stats['limit_maxbytes'] - $stats['bytes'];
+                $this->max_packet = parse_bytes($max_packet) ?: $this->max_packet;
-                    $this->max_packet = min($remaining / 5, $this->max_packet);
-                }
-            }
-            else if ($this->type == 'apc' && function_exists('apc_sma_info')) {
-                if ($stats = apc_sma_info()) {
-                    $this->max_packet = min($stats['avail_mem'] / 5, $this->max_packet);
-                }
             }
         }
 

program/lib/Roundcube/rcube_utils.php

@@ -1274,4 +1274,22 @@ class rcube_utils
             $options = $options[$host];
         }
     }
+
+    /**
+     * Get maximum upload size
+     *
+     * @return int Maximum size in bytes
+     */
+    public static function max_upload_size()
+    {
+        // find max filesize value
+        $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
+        $max_postsize = parse_bytes(ini_get('post_max_size'));
+
+        if ($max_postsize && $max_postsize < $max_filesize) {
+            $max_filesize = $max_postsize;
+        }
+
+        return $max_filesize;
+    }
 }

program/steps/addressbook/import.inc

@@ -77,7 +77,7 @@ if (is_array($_FILES['_file'])) {
     // no vcards detected
     if (!count($vcards)) {
         if ($upload_error == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-            $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+            $size = $RCMAIL->show_bytes(rcube_utils::max_upload_size());
             $OUTPUT->show_message('filesizeerror', 'error', array('size' => $size));
         }
         else if ($upload_error) {

program/steps/addressbook/upload_photo.inc

@@ -64,7 +64,7 @@ if ($filepath = $_FILES['_photo']['tmp_name']) {
     }
     else {  // upload failed
         $err  = $_FILES['_photo']['error'];
-        $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+        $size = $RCMAIL->show_bytes(rcube_utils::max_upload_size());
 
         if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE)
             $msg = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $size)));

program/steps/mail/attachments.inc

@@ -160,7 +160,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
         }
         else {  // upload failed
             if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+                $size = $RCMAIL->show_bytes(rcube_utils::max_upload_size());
                 $msg  = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $size)));
             }
             else if ($attachment['error']) {

program/steps/mail/import.inc

@@ -92,7 +92,7 @@ if (is_array($_FILES['_file'])) {
         }
 
         if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-            $size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+            $size = $RCMAIL->show_bytes(rcube_utils::max_upload_size());
             $msg  = $RCMAIL->gettext(array('name' => 'filesizeerror', 'vars' => array('size' => $size)));
         }
         else if ($err) {

program/steps/settings/upload.inc

@@ -47,7 +47,7 @@ $IMAGE_TYPES = explode(',', 'jpeg,jpg,jp2,tiff,tif,bmp,eps,gif,png,png8,png24,pn
 $OUTPUT->reset();
 
 $max_size  = $RCMAIL->config->get($type . '_image_size', 64) * 1024;
-$post_size = $RCMAIL->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
+$post_size = $RCMAIL->show_bytes(rcube_utils::max_upload_size());
 $uploadid  = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GET);