Merge branch 'keep-alive'

Conflicts:
	CHANGELOG

1 files changed, 1 insertions, 19 deletions

diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 6192466cd..c71efa2aa 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -43,7 +43,6 @@ class rcube_session
   private $secret = '';
   private $ip_check = false;
   private $logging = false;
-  private $keep_alive = 0;
   private $memcache;
 
   /**
@@ -525,24 +524,6 @@ class rcube_session
       $this->now = $now - ($now % ($this->lifetime / 2));
   }
 
-  /**
-   * Setter for keep_alive interval
-   */
-  public function set_keep_alive($keep_alive)
-  {
-    $this->keep_alive = $keep_alive;
-
-    if ($this->lifetime < $keep_alive)
-        $this->set_lifetime($keep_alive + 30);
-  }
-
-  /**
-   * Getter for keep_alive interval
-   */
-  public function get_keep_alive()
-  {
-    return $this->keep_alive;
-  }
 
   /**
    * Getter for remote IP saved with this session
@@ -552,6 +533,7 @@ class rcube_session
     return $this->ip;
   }
 
+
   /**
    * Setter for cookie encryption secret
    */