Merge pull request #73 in ZP/z-push from release/2.2 to master

* commit '71e0f49f': (27 commits)
  ZP-727 Bump to 2.2.5 final, Fix newline.
  Revert "Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop"
  Revert "Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop"
  Revert "Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop"
  Revert "Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop"
  Revert "Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop"
  Revert "Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop"
  Revert "Merge pull request #38 in ZP/z-push from feature/ZP-677-expose-resync-folder-funcitonality to develop"
  Revert "Merge pull request #62 in ZP/z-push from feature/ZP-721-add-error-log-viewer-shortcut-to-z-push-top to develop"
  Revert "Merge pull request #60 in ZP/z-push from bugfix/ZP-717-set-you-answered-this-message-on-date to develop"
  Revert "Merge pull request #57 in ZP/z-push from bugfix/ZP-704-z-push-top-screen-size-calculation-fails-under-OS-X to develop"
  Revert "Merge pull request #35 in ZP/z-push from bugfix/ZP-676-streamer-type-streamer_type_send_empty to develop"
  ZP-727 Bumped version to 2.2.5alpha1 and removed newlines at end of files.
  Merge pull request #70 in ZP/z-push from bugfix/ZP-728-change-usage-of-sync_max_items to develop
  ZP-727 Bump version to 2.2.5 alpha. Removed newlines at end of files for modified files.
  Merge pull request #55 in ZP/z-push from bugfix/ZP-702-Attachments-are-1-or-2-bytes-short to develop
  Merge pull request #69 in ZP/z-push from bugfix/ZP-656-warnings-for-signed-emails-in-sent to develop
  Merge pull request #67 in ZP/z-push from bugfix/ZP-726-infinit-loop-if-non-stream-given-for-an-attachment to develop
  Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop
  Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop
  ...

src/autodiscover/autodiscover.php

@@ -53,6 +53,7 @@ include_once('../lib/interface/iexportchanges.php');
 include_once('../lib/interface/iimportchanges.php');
 include_once('../lib/interface/isearchprovider.php');
 include_once('../lib/interface/istatemachine.php');
+include_once('../lib/request/request.php');
 include_once('../version.php');
 include_once('config.php');
 

src/lib/request/sync.php

@@ -903,10 +903,10 @@ class Sync extends RequestProcessor {
 
                         if($sc->GetParameter($spa, "getchanges") && $spa->HasFolderId() && $spa->HasContentClass() && $spa->HasSyncKey()) {
                             $windowSize = self::$deviceManager->GetWindowSize($spa->GetFolderId(), $spa->GetContentClass(), $spa->GetUuid(), $spa->GetUuidCounter(), $changecount);
-                            
+
                             // limit windowSize to the max available limit of the global window size left
                             $globallyAvailable = $sc->GetGlobalWindowSize() - $globallyExportedItems;
-                            if ($changecount > $globallyAvailable) {
+                            if ($changecount > $globallyAvailable && $windowSize > $globallyAvailable) {
                                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): Limit window size to %d as the global window size limit will be reached", $globallyAvailable));
                                 $windowSize = $globallyAvailable;
                             }

src/version.php

@@ -6,7 +6,7 @@
 *
 * Created   :   18.04.2008
 *
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
+* Copyright 2007 - 2015 Zarafa Deutschland GmbH
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License, version 3,
@@ -41,6 +41,6 @@
 * Consult LICENSE file for details
 ************************************************/
 
-define("ZPUSH_VERSION", "2.2.4");
+define("ZPUSH_VERSION", "2.2.5");
 
 ?>
\ No newline at end of file