diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-11-30 21:40:22 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-11-30 21:40:22 +0000 |
| commit | 0bec03301b38e1ed2d7a73391e065a787e0e3510 (patch) | |
| tree | 560520b938ccb9d31b5883091bd3d37e10bed9ea | |
| parent | 297241991937160c057ed6f181ef441ebe6aaaaf (diff) | |
| parent | 2d911974d751334f4c6ca1bc3b0f3f98e220436e (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/gallery/controllers/combined.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.build_number b/.build_number index 6d8dc21b..d41d4003 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=182 +build_number=183 diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php index ef640bd9..5c192b60 100644 --- a/modules/gallery/controllers/combined.php +++ b/modules/gallery/controllers/combined.php @@ -67,6 +67,7 @@ class Combined_Controller extends Controller { if ($use_gzip && $content = $cache->get("{$key}_gz")) { header("Content-Encoding: gzip"); + header("Vary: Accept-Encoding"); } else { // Fall back to non-gzipped if we have to $content = $cache->get($key); @@ -83,8 +84,9 @@ class Combined_Controller extends Controller { } header("Expires: Tue, 19 Jan 2038 00:00:00 GMT"); header("Cache-Control: max-age=2678400"); - header('Pragma: public'); + header("Pragma: public"); header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time())); + header("Content-Length: " . strlen($content)); Kohana::close_buffers(false); print $content; |