diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:10:06 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:10:06 +0100 |
| commit | 4212c304ab47537141e45e2ac1442410c83e800c (patch) | |
| tree | f801baf1f3c42106c7166c554462d77968335a9f | |
| parent | f6cc30cbfe08377c2e6f5ce332bef2ad240cb950 (diff) | |
| parent | 53a9131db68d17de092fe2b6bf04b411226a1134 (diff) | |
| download | forums-4212c304ab47537141e45e2ac1442410c83e800c.tar forums-4212c304ab47537141e45e2ac1442410c83e800c.tar.gz forums-4212c304ab47537141e45e2ac1442410c83e800c.tar.bz2 forums-4212c304ab47537141e45e2ac1442410c83e800c.tar.xz forums-4212c304ab47537141e45e2ac1442410c83e800c.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14290] Correctly use modified since header
| -rw-r--r-- | phpBB/includes/functions_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 9adbfc9baf..b295d4cd1e 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -413,7 +413,7 @@ function set_modified_headers($stamp, $browser) global $request; // 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)) { |