Branch 'kolab-syncroton-2.2' - 4 commits - docs/SQL lib/ext
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Tue Sep 30 15:12:41 CEST 2014
docs/SQL/mysql.initial.sql | 16 ++++++++--------
docs/SQL/mysql/2013011200.sql | 2 +-
docs/SQL/mysql/2013011600.sql | 2 +-
docs/SQL/mysql/2013040700.sql | 2 +-
lib/ext/Syncroton/Command/Sync.php | 6 +++++-
5 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit bfd68fbb525ed62b79ebf0c970b6fdc045daa2c3
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Tue Sep 30 15:12:17 2014 +0200
wp and wp8 devices would need to re-register, making 2.2-next unstable
Revert "Fix recent Windows Phone devices detection (#3228)"
This reverts commit f79ce3d5050da80af26ed162c0c431560988a196.
diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
index d9bbf42..3579a12 100644
--- a/lib/kolab_sync_data.php
+++ b/lib/kolab_sync_data.php
@@ -108,8 +108,6 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
'ipad',
'thundertine',
'windowsphone',
- 'wp',
- 'wp8',
'playbook',
);
commit 4355fd555fd33790c9ce08834e88ed0fe1f93005
Author: Aleksander Machniak <alec at alec.pl>
Date: Mon Aug 18 10:25:26 2014 +0200
Fix handling of WindowSize=0 (#3050)
diff --git a/lib/ext/Syncroton/Command/Sync.php b/lib/ext/Syncroton/Command/Sync.php
index 89e4363..6b9fe1f 100644
--- a/lib/ext/Syncroton/Command/Sync.php
+++ b/lib/ext/Syncroton/Command/Sync.php
@@ -131,7 +131,11 @@ class Syncroton_Command_Sync extends Syncroton_Command_Wbxml
}
$this->_globalWindowSize = isset($requestXML->WindowSize) ? (int)$requestXML->WindowSize : 100;
-
+
+ if (!$this->_globalWindowSize || $this->_globalWindowSize > 512) {
+ $this->_globalWindowSize = 512;
+ }
+
if ($this->_globalWindowSize > $this->_maxWindowSize) {
$this->_globalWindowSize = $this->_maxWindowSize;
}
commit f79ce3d5050da80af26ed162c0c431560988a196
Author: Aleksander Machniak <alec at alec.pl>
Date: Mon Aug 18 10:06:49 2014 +0200
Fix recent Windows Phone devices detection (#3228)
diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
index 3579a12..d9bbf42 100644
--- a/lib/kolab_sync_data.php
+++ b/lib/kolab_sync_data.php
@@ -108,6 +108,8 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
'ipad',
'thundertine',
'windowsphone',
+ 'wp',
+ 'wp8',
'playbook',
);
commit 76a196b642b1413b7937e9979ab4170383f1569e
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Mon Sep 1 13:25:33 2014 +0200
Add missing ENGINE and CHARACTER SET clauses (#3262)
diff --git a/docs/SQL/mysql.initial.sql b/docs/SQL/mysql.initial.sql
index bbaa2c7..d042dce 100644
--- a/docs/SQL/mysql.initial.sql
+++ b/docs/SQL/mysql.initial.sql
@@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_policy` (
`policy_key` varchar(64) NOT NULL,
`json_policy` blob NOT NULL,
PRIMARY KEY (`id`)
-);
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_device` (
`id` varchar(40) NOT NULL,
@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_device` (
`emailfilter_id` varchar(40) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `owner_id--deviceid` (`owner_id`, `deviceid`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_folder` (
`id` varchar(40) NOT NULL,
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_folder` (
UNIQUE KEY `device_id--class--folderid` (`device_id`(40),`class`(40),`folderid`(40)),
KEY `folderstates::device_id--devices::id` (`device_id`),
CONSTRAINT `folderstates::device_id--devices::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_synckey` (
`id` varchar(40) NOT NULL,
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_synckey` (
PRIMARY KEY (`id`),
UNIQUE KEY `device_id--type--counter` (`device_id`,`type`,`counter`),
CONSTRAINT `syncroton_synckey::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_content` (
`id` varchar(40) NOT NULL,
@@ -75,7 +75,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_content` (
UNIQUE KEY `device_id--folder_id--contentid` (`device_id`(40),`folder_id`(40),`contentid`(128)),
KEY `syncroton_contents::device_id` (`device_id`),
CONSTRAINT `syncroton_contents::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_data` (
`id` varchar(40) NOT NULL,
@@ -83,7 +83,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data` (
`folder_id` varchar(40) NOT NULL,
`data` longblob,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
`id` varchar(40) NOT NULL,
@@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_data_folder` (
`owner_id` varchar(40) NOT NULL,
`parent_id` varchar(40) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
`device_id` varchar(40) NOT NULL,
@@ -102,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
PRIMARY KEY (`device_id`,`folder_id`,`synctime`),
KEY `syncroton_modseq::device_id` (`device_id`),
CONSTRAINT `syncroton_modseq::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-- Roundcube core table should exist if we're using the same database
diff --git a/docs/SQL/mysql/2013011200.sql b/docs/SQL/mysql/2013011200.sql
index bcf8453..d9169ee 100644
--- a/docs/SQL/mysql/2013011200.sql
+++ b/docs/SQL/mysql/2013011200.sql
@@ -8,4 +8,4 @@ CREATE TABLE `syncroton_data_folder` (
`owner_id` varchar(40) NOT NULL,
`parent_id` varchar(40) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/docs/SQL/mysql/2013011600.sql b/docs/SQL/mysql/2013011600.sql
index 914f750..0c6b7ec 100644
--- a/docs/SQL/mysql/2013011600.sql
+++ b/docs/SQL/mysql/2013011600.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `syncroton_modseq` (
PRIMARY KEY (`device_id`,`folder_id`,`synctime`),
KEY `syncroton_modseq::device_id` (`device_id`),
CONSTRAINT `syncroton_modseq::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) ENGINE=InnoDB;
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/docs/SQL/mysql/2013040700.sql b/docs/SQL/mysql/2013040700.sql
index 501d3d9..b68440c 100644
--- a/docs/SQL/mysql/2013040700.sql
+++ b/docs/SQL/mysql/2013040700.sql
@@ -6,4 +6,4 @@ CREATE TABLE IF NOT EXISTS `syncroton_policy` (
`policy_key` varchar(64) NOT NULL,
`json_policy` blob NOT NULL,
PRIMARY KEY (`id`)
-);
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
More information about the commits
mailing list