Fix a possible PING loop due to broken iOS clients.

horde · Apr 26, 2014 · 477a206 · 477a206
1 parent 8b26f84
commit 477a206
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
@@ -178,12 +178,13 @@ protected function _handle()
                     $this->_decoder->getElementEndTag();
 
                     try {
-                        // Explicitly asked for a collection, make sure we have a key.
+                        // Explicitly asked for a collection, make sure we have
+                        // a key, but silently ignore the collection if we don't
+                        // Otherwise, this can set up a PING loop in broken
+                        // iOS clients that request collections in PING before
+                        // they issue an initial SYNC for them.
                         $collections->addCollection($collection, true);
                     } catch (Horde_ActiveSync_Exception_StateGone $e) {
-                        $this->_statusCode = self::STATUS_FOLDERSYNCREQD;
-                        $this->_handleGlobalError();
-                        return true;
                     }
                 }