Commit 9a4d638b authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #626 in ZP/z-push from...

Merge pull request #626 in ZP/z-push from bugfix/ZP-1326-airwatch-boxer-not-working-on-ios to develop

* commit 'dc53e48d':
  ZP-1326 Revert "ZP-1326 Added KOE_CAPABILITY_IMPERSONATE config parameter."
  ZP-1326 Added KOE_CAPABILITY_IMPERSONATE config parameter.
  ZP-250 Include utils in printwbxml.
  ZP-1326 Support empty GetChanges container.
parents 0ff51ecd dc53e48d
...@@ -233,10 +233,9 @@ class Sync extends RequestProcessor { ...@@ -233,10 +233,9 @@ class Sync extends RequestProcessor {
$sc->AddParameter($spa, "getchanges", true); $sc->AddParameter($spa, "getchanges", true);
if (($gc = self::$decoder->getElementContent()) !== false) { if (($gc = self::$decoder->getElementContent()) !== false) {
$sc->AddParameter($spa, "getchanges", $gc); $sc->AddParameter($spa, "getchanges", $gc);
if(!self::$decoder->getElementEndTag()) {
return false;
}
} }
// read the endtag if it's there, but don't fail if it isn't
self::$decoder->getElementEndTag();
} }
if(self::$decoder->getElementStartTag(SYNC_WINDOWSIZE)) { if(self::$decoder->getElementStartTag(SYNC_WINDOWSIZE)) {
......
...@@ -30,6 +30,7 @@ $wbxml64 = is_file($argv[1]) ? realpath($argv[1]) : $argv[1]; ...@@ -30,6 +30,7 @@ $wbxml64 = is_file($argv[1]) ? realpath($argv[1]) : $argv[1];
chdir(__DIR__); chdir(__DIR__);
// include the stuff we need // include the stuff we need
include_once('../../src/lib/utils/utils.php');
include_once('../../src/lib/utils/stringstreamwrapper.php'); include_once('../../src/lib/utils/stringstreamwrapper.php');
include_once('../../src/lib/wbxml/wbxmldefs.php'); include_once('../../src/lib/wbxml/wbxmldefs.php');
include_once('../../src/lib/wbxml/wbxmldecoder.php'); include_once('../../src/lib/wbxml/wbxmldecoder.php');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment