Merge branch '3.2.x'

* 3.2.x:
  [ticket/14290] Correctly use modified since header
This commit is contained in:
Tristan Darricau 2016-03-25 11:11:09 +01:00
commit ba9e9ecfa3

View file

@ -413,7 +413,7 @@ function set_modified_headers($stamp, $browser)
global $request; global $request;
// let's see if we have to send the file at all // let's see if we have to send the file at all
$last_load = $request->header('Modified-Since') ? strtotime(trim($request->header('Modified-Since'))) : false; $last_load = $request->header('If-Modified-Since') ? strtotime(trim($request->header('If-Modified-Since'))) : false;
if (strpos(strtolower($browser), 'msie 6.0') === false && !phpbb_is_greater_ie_version($browser, 7)) if (strpos(strtolower($browser), 'msie 6.0') === false && !phpbb_is_greater_ie_version($browser, 7))
{ {