From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 18 Apr 2010 16:44:11 +0000 (-0400)
Subject: Use the configured heartbeat default
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=57d981681b216f5ed0bf9ccb1a840d6e90f0bd6e;p=horde.git

Use the configured heartbeat default
---

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
index 436477c89..4e4fe51da 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
@@ -106,6 +106,10 @@ class Horde_ActiveSync_Request_Ping extends Horde_ActiveSync_Request_Base
                 $this->_decoder->getElementEndTag();
             }
 
+            if ($lifetime == 0) {
+                $lifetime = $ping_settings['heartbeatdefault'];
+            }
+
             if ($this->_decoder->getElementStartTag(self::FOLDERS)) {
                 $collections = array();
                 while ($this->_decoder->getElementStartTag(self::FOLDER)) {