Commit affc64bd authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #327 in ZP/z-push from develop to release/2.3

* commit 'e68275f4':
  ZP-1008 Missing Syncronize output end tag on sync when folder hierarchy changed.
  ZP-1008 Missing Syncronize output end tag on sync when folder hierarchy revert.
  ZP-1008 Missing Syncronize output end tag on sync when folder hierarchy changed.
  ZP-1004 Remove dependency on "apache2" from z-push-autodiscover. Released under the Affero GNU General Public License (AGPL) version 3.
parents a9960830 e68275f4
...@@ -92,7 +92,7 @@ Description: Z-Push mysql state backend ...@@ -92,7 +92,7 @@ Description: Z-Push mysql state backend
Package: z-push-autodiscover Package: z-push-autodiscover
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), apache2, z-push-backend-caldav | z-push-backend-carddav | z-push-backend-combined | z-push-backend-imap | z-push-backend-ldap | z-push-backend-kopano Depends: ${misc:Depends}, z-push-common (= ${binary:Version}), z-push-backend-caldav | z-push-backend-carddav | z-push-backend-combined | z-push-backend-imap | z-push-backend-ldap | z-push-backend-kopano
Description: Z-Push autodiscover Description: Z-Push autodiscover
Autodiscover for Z-Push backends Autodiscover for Z-Push backends
...@@ -106,4 +106,4 @@ Package: z-push-config-apache-autodiscover ...@@ -106,4 +106,4 @@ Package: z-push-config-apache-autodiscover
Architecture: all Architecture: all
Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), libapache2-mod-php5 Depends: ${misc:Depends}, z-push-autodiscover (= ${binary:Version}), libapache2-mod-php5
Description: Z-Push autodiscover apache configuration Description: Z-Push autodiscover apache configuration
Z-push autodiscover apache configuration files Z-push autodiscover apache configuration files
\ No newline at end of file
...@@ -751,6 +751,7 @@ class Sync extends RequestProcessor { ...@@ -751,6 +751,7 @@ class Sync extends RequestProcessor {
self::$encoder->startTag(SYNC_STATUS); self::$encoder->startTag(SYNC_STATUS);
self::$encoder->content($status); self::$encoder->content($status);
self::$encoder->endTag(); self::$encoder->endTag();
self::$encoder->endTag(); // SYNC_SYNCHRONIZE
return true; return true;
} }
...@@ -891,6 +892,7 @@ class Sync extends RequestProcessor { ...@@ -891,6 +892,7 @@ class Sync extends RequestProcessor {
self::$encoder->startTag(SYNC_STATUS); self::$encoder->startTag(SYNC_STATUS);
self::$encoder->content($status); self::$encoder->content($status);
self::$encoder->endTag(); self::$encoder->endTag();
self::$encoder->endTag(); // SYNC_SYNCHRONIZE
return true; return true;
} }
......
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