diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-05-18 00:14:07 +0000 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-05-18 00:14:07 +0000 |
commit | fd0c0a608a5de2b26c29d3c44a7929e5a3b2c042 (patch) | |
tree | 387f2628cae3580b7f09682de6e908d002c5fbb0 /kohana/helpers/expires.php | |
parent | 5a6aef9c23930b1de609c9914297e0f97bc49a11 (diff) |
Updated kohana and modules/unit_test to upstream r4356
Diffstat (limited to 'kohana/helpers/expires.php')
-rw-r--r-- | kohana/helpers/expires.php | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |