* commit '20281136':
  ZP-651 Only contact DeviceManager if DeviceID is set. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 57437225)

* commit '967a0c36':
  ZP-697 Honour global window size. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 5716e806)

Merge pull request #43 in ZP/z-push from bugfix/ZP-692-diffstate.php-use-different-cutoff to develop

* commit '9106da1f':
  ZP-692 Add notes and set to false when we don't care about filtertime. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-692 Different cutoff dates. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 0dbd04af)

* commit '5c9b2683':
  ZP-680 Rename package to 'z-push-dev', remove version string so the version can be determined from git tags. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-680 Bump to version 2.3 to go into develop, fix z-push.org link. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-660 Composer package. Released under the Affero GNU General Public License (AGPL) version 3. Creating a z-push/z-push package on https://packegist.org/ to be able to install released versions of z-push via Composer. This requires a composer.json file in the root of the package.

(cherry picked from commit 57704dea)

Merge pull request #42 in ZP/z-push from feature/ZP-686-use-php_sapi_name-to-detect-console to develop

* commit 'e5f75f64':
  ZP-686 Do not expose information in state migrate script. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-686 Add check also to z-push-top. Don't expose additional information about the system configuration to a potential attacker. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-686 Replace $_SERVER["TERM"] with php_sapi_name(). Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 02ffccf1)

Merge pull request #47 in ZP/z-push from feature/ZP-687-extract-zarafa-mapiprovider-getsyncblobfromtz to develop

* commit 'd75e8b87':
  ZP-687 Extract function from Zarafa MAPI provider to TimeZoneUtils. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 0b5edfc3)

* commit '01d04d3d':
  ZP-690 Remove extra count. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit ab13d880)

Merge pull request #45 in ZP/z-push from bugfix/ZP-689-stateobject.php-use-args-in-sprintf to develop

* commit 'b27439fa':
  ZP-689 Use args in sprintf. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6e73f339)

Merge pull request #44 in ZP/z-push from bugfix/ZP-688-devicemanager.php-typo-in-log-line to develop

* commit '671c6f50':
  ZP-688 Typo in log message. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 42033e4f)

* commit 'b57de6be':
  ZP-683 Fix typo. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 3a663014)

Merge pull request #33 in ZP/z-push from feature/ZP-671-log-memory-and-time-details-on-end to develop

* commit 'aac92fc7':
  ZP-671 Changes recommended by Manfred. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-671 Log memory and time info. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 80c61fc1)

Merge pull request #34 in ZP/z-push from bugfix/ZP-672-options-without-authentication-info to develop

* commit '0db8a314':
  ZP-672 Always require Authentication header. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-672 Options without authentication info. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 22dd9503)

* commit '86eea041':
  ZP-678 Allow to autoload backends. Released under the Affero GNU General Public License (AGPL) version 3. Do not try to include backend, if it can be or is already autoloaded. Allows to place backends outside z-push package.

(cherry picked from commit cf3ad6fb)

Merge pull request #32 in ZP/z-push from bugfix/ZP-670-autodiscover-use-http_response_code to develop

* commit 'd4524802':
  ZP-670 Use http_response_code. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 35763ff2)

Merge pull request #31 in ZP/z-push from feature/ZP-669-compat-add-function-http_response_code to develop

* commit '4c356e5e':
  ZP-669 Add function http_response_code to compat. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 98f36d84)

Merge pull request #22 in ZP/z-push from feature/ZP-659-backendcombined-add-changessink-methods to develop

* commit '1af618fb':
  ZP-659 Remove else. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-659 - Add ChangesSink methods. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 5ef30764)

Merge pull request #17 in ZP/z-push from feature/ZP-565-add-folderid-to-the-exportchangesdiff--initializeexporter to develop

* commit '3d7b775b':
  ZP-565 Added folderid to the output of found changes. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 17f2507c)

* commit 'e070d653':
  First check if neither object has the array property set, and if that is the case log it at debug level and continue with the comparison of other properties.

(cherry picked from commit 08bf61c6)

Merge pull request #23 in ZP/z-push from feature/ZP-660-backendcombined-implement-searchprovider to develop

* commit '6a8f86d7':
  ZP-660 Implement SearchProvider. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit c550648b)

Merge pull request #24 in ZP/z-push from feature/ZP-661-backendcombined-return-min-as-version to develop

* commit '37b2caa8':
  ZP-661 Return AS supported version. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 6abb6e5c)

* commit '5c41dc02':
  ZP-662 Simplify BackendCombined config. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 042bceb5)

* commit '43dd0a50':
  ZP-663 Lower log level. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit d7647b75)

Merge pull request #27 in ZP/z-push from bugfix/ZP-664-backendcombined-don-t-execute-logoff to develop

* commit '595ae7c5':
  ZP-664 Don't execute Logoff if not needed. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 669dbd1e)

Merge pull request #21 in ZP/z-push from bugfix/ZP-658-backendcombined-add-emptyfolder-function to develop

* commit 'e83df703':
  ZP-658 Add EmptyFolder function. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 1b6974c2)

Merge pull request #20 in ZP/z-push from bugfix/ZP-657-backendcombined-wrong-parameter-name to develop

* commit 'bbd1fd4d':
  ZP-657 Wrong parameter name. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 316da552)

* commit 'e47a725a':
  ZP-651 Use user agent exposed by DeviceManager (depends on ZP-655). Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 92eeac46)

Merge pull request #18 in ZP/z-push from feature/ZP-655-provide-getter-function-to-retrieve to develop

* commit '4c50ac89':
  ZP-655 Added GetUserAgent to DeviceManager. Released under the Affero GNU General Public License (AGPL) version 3.

(cherry picked from commit 86ba13ee)

* commit 'd15b4438':
  ZP-651 #comment use DeviceType if UserAgent is not available

(cherry picked from commit 2f0206ed)

ZP-652 #comment better diffstate performance

* commit '8cd0a71f':
  - improve performance, by not iterating for each entry through all entries, but initially create an associative array of old entries indexed by their key and then iterating through the new entries once identifying new, modfied or removed entries (this makes a hugh difference eg. for addressbooks with a couple of thousand entries more then a factor of 10) - it drops the requirement that ids need to be in ascending order, new diff code works also if $new contains smaller ids. That happens eg. for us when a users unsubscribs from a mail folder and subscribes again

(cherry picked from commit 8f0ed00c)

ZP-639 #comment EqualTo is not correctly set

* commit '5c2a9ff7':
  Fix the issue where the decoder code for Search mistakenly assigns the element SYNC_SEARCH_VALUE for search type SYNC_SEARCH_EQUALTO into the ContentParameters object as SearchValueLess instead of SearchValueEqualTo

(cherry picked from commit bca014d5)

Merge pull request #8 in ZP/z-push from feature/ZP-642-improve-getstate-debug-messages-for to develop

ZP-642 #comment log bytes read from file to log message

* commit 'f11dc946':
  Separate the calls to unserialize() and file_get_contents() so that the size of the file contents can be logged in the debug message.

(cherry picked from commit 23ac1fd3)

Merge pull request #9 in ZP/z-push from bugfix/ZP-643-autodiscover-missing-variable-in-log to develop

* commit '4b2a18d7':
  fix(ZP-643): Missing variable in Log sprintf block

(cherry picked from commit d645aa05)

Merge pull request #11 in ZP/z-push from bugfix/ZP-645-php-5.4-obstart-needs-an-extra-flag to develop

* commit '074cc4b9':
  fix(ZP-645): PHP 5.4+ ob_start() needs an extra flag to allow truncate.

(cherry picked from commit 1f362fb2)

* commit '6ed7292c':
  fix(ZP-646): BackendSearchLDAP uses bad range limit

(cherry picked from commit 08dddcd7)

Merge pull request #14 in ZP/z-push from bugfix/ZP-647-backendcombined-sendmail-source--folderid to develop

* commit 'bfc4c616':
  fix(ZP-647): BackendCombined: SendMail source->folderid

(cherry picked from commit 21a2d658)

ZP-632

* commit '61453208':
  Allow to create own entrypoint / index.php with unmodified z-push sources If you use composer or upstream git repo as sub-project you cant modify config.php to your needs. Patch allows to create an own index.php as follows: <?php define('ZPUSH_CONFIG', __DIR__.'/config.php'); $_SERVER['SCRIPT_FILENAME'] = realpath(__DIR__.'/../vendor/zarafa/zpush2/index.php'); chdir('../vendor/zarafa/zpush2'); include('../vendor/zarafa/zpush2/src/index.php');

(cherry picked from commit 119acfdc)

the Affero GNU General Public License (AGPL) version 3.

git-svn-id: https://z-push.org/svn/z-push/trunk@1978 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5