[commits] Horde branch master updated. a984bc8722eafbbb72af0f579dc0e576aff83e01

[Michael J. Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: ffd0267613326c218716ad8d2256d30501a5ce4e

2eecfe0 Kolab_Storage: Fix sync race condition when using sync token
a984bc8 Merge branch 'thomasjfox-kolab-storage-fix-token-sync'

Summary: http://github.com/horde/horde/compare/ffd0267613326c218716ad8d2256d30501a5ce4e...a984bc8722eafbbb72af0f579dc0e576aff83e01

-----------------------------------------------------------------------

commit 2eecfe059e5044397609888aec02ab1bec5caa7c
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Fri Sep 18 12:36:04 2015 +0200

    Kolab_Storage: Fix sync race condition when using sync token
    
    When using the new sync token strategy, we have to get
    the folder status before calling sync(). That's the same
    way the non-token based sync works.
    
    Internally, Horde_Imap_Client uses "uidnext" to determine
    if there are any new messages. If we first sync and then
    get the folder status (and we force a status refresh in our
    status() function), we might write down a higher
    "uidnext" value than the one used for the sync() call.
    
    This fixes vanishing contacts on changes from foreign Kolab clients
    when using turba and ActiveSync at the same time: We didn't register
    the new message (=updated contact), only the delete of the old IMAP message.

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/2eecfe059e5044397609888aec02ab1bec5caa7c

-----------------------------------------------------------------------

commit a984bc8722eafbbb72af0f579dc0e576aff83e01
Merge: ffd0267 2eecfe0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Sep 17 08:11:51 2015 -0400

    Merge branch 'thomasjfox-kolab-storage-fix-token-sync'

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/a984bc8722eafbbb72af0f579dc0e576aff83e01