Request 3341 (superseded)

This request is superseded by request 3342 (Show diff)

You're not reviewing the full diff of request 3341 , but the diff to the superseded request 3338 (Show full diff)

Overview

Request 3341 (superseded)

New release 2.4.2.38

Created by mollekopf about 2 months ago
In state superseded
Supersedes 3338
Superseded by 3342
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/Folder.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_email.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_storage.php Changed

@@ -1941,11 +1941,15 @@
 
         // Protect against inserting the same values twice (this code can be executed twice in the same request)
         if (!isset($this->relations$folderid$synctime)) {
-            $rcube    = rcube::get_instance();
-            $db       = $rcube->get_dbh();
+            $rcube = rcube::get_instance();
+            $db = $rcube->get_dbh();
             $this->relations$folderid$synctime = $relations;
             $data = gzdeflate(json_encode($relations));
 
+            if ($data === false) {
+                throw new Exception("Failed to compress relation data");
+            }
+
             $result = $db->insert_or_update(
                 'syncroton_relations_state',
                 'device_id' => $device_key, 'folder_id' => $folderid, 'synctime' => $synctime,
@@ -1966,13 +1970,14 @@
     {
         $synctime = $synctime->format('Y-m-d H:i:s');
 
-        //If we had a collision before
+        // If we had a collision before
         if (isset($this->relations$folderid$synctime . "-1")) {
             return $this->relations$folderid$synctime . "-1";
         }
+
         if (!isset($this->relations$folderid$synctime)) {
             $rcube = rcube::get_instance();
-            $db    = $rcube->get_dbh();
+            $db = $rcube->get_dbh();
 
             $db->limitquery(
                 "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
@@ -1984,6 +1989,7 @@
                 $folderid,
                 $synctime
             );
+
             $row = $db->fetch_assoc();
             if (!$row) {
                 // Only if we don't have a timestamp that is older than synctime do we return the next best.
@@ -2008,9 +2014,10 @@
                 // Note: We use the internal cache because there's a call to both hasChanges() and
                 // getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
                 $data = $row'data';
-                $inflated = gzinflate($data);
-                // Inflation may fail for backward compatiblity
-                $data = $inflated ? $inflated : $data;
+                // Support data in both compressed and uncompressed format
+                if (strlen($data) && $data0 != '{' && $data0 != '') {
+                    $data = gzinflate($data);
+                }
                 $this->relations$folderid$synctime = json_decode($data, true);
 
                 // Cleanup: remove all records older than the current one.

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3341 0

Request History

mollekopf created request about 2 months ago

New release 2.4.2.38

mollekopf superseded request about 2 months ago

superseded by 3342