From fd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 18 May 2009 00:14:07 +0000 Subject: Updated kohana and modules/unit_test to upstream r4356 --- kohana/helpers/expires.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kohana/helpers/expires.php') diff --git a/kohana/helpers/expires.php b/kohana/helpers/expires.php index 454cf12a..8d8ef0f8 100644 --- a/kohana/helpers/expires.php +++ b/kohana/helpers/expires.php @@ -88,7 +88,8 @@ class expires_Core { { foreach (headers_list() as $header) { - if (stripos($header, 'Last-Modified:') === 0 OR stripos($header, 'Expires:') === 0) + if ((session_cache_limiter() == '' AND stripos($header, 'Last-Modified:') === 0) + OR stripos($header, 'Expires:') === 0) { return FALSE; } -- cgit v1.2.3