From a7724dc6e57184456aed0f1b26bdfc77a59ecc47 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 28 Jan 2014 15:06:47 +0000
Subject: [PATCH] remove Expires header from egw_session::cache_control(true),
 so have same behavior as session_cache_limiter("private_no_expire")

---
 phpgwapi/inc/class.egw_session.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 284196b280..542b35b69d 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -1690,9 +1690,10 @@ class egw_session
 					error_log(__METHOD__."($expire) called, but header already sent in $file: $line");
 					return;
 				}
-				if($expire === true)
+				if($expire === true)	// same behavior as session_cache_limiter('private_no_expire')
 				{
 					header('Cache-Control: private, max-age='.(60*session_cache_expire()));
+					header_remove('Expires');
 				}
 				else
 				{