From 5b969fd069e239e4126b52377518ac98968b1aab Mon Sep 17 00:00:00 2001 From: ffchung Date: Sat, 29 Oct 2011 23:03:06 +0800 Subject: gzip stream problem on Google Chrome --- modules/gallery/controllers/combined.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php index ef640bd9..fe177569 100644 --- a/modules/gallery/controllers/combined.php +++ b/modules/gallery/controllers/combined.php @@ -67,6 +67,8 @@ class Combined_Controller extends Controller { if ($use_gzip && $content = $cache->get("{$key}_gz")) { header("Content-Encoding: gzip"); + header("Content-Length: ".strlen($content)); + header("Vary: Accept-Encoding"); } else { // Fall back to non-gzipped if we have to $content = $cache->get($key); -- cgit v1.2.3 From 47fdf1e35abbc37bbb24fcda4222e92202d2d0e4 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 24 Nov 2011 11:21:32 -0800 Subject: Move the Content-Length header into the main block, fix some formatting. Follow-on to 5b969fd069e239e4126b52377518ac98968b1aab which is a fix for #1802. --- modules/gallery/controllers/combined.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php index fe177569..5c192b60 100644 --- a/modules/gallery/controllers/combined.php +++ b/modules/gallery/controllers/combined.php @@ -67,7 +67,6 @@ class Combined_Controller extends Controller { if ($use_gzip && $content = $cache->get("{$key}_gz")) { header("Content-Encoding: gzip"); - header("Content-Length: ".strlen($content)); header("Vary: Accept-Encoding"); } else { // Fall back to non-gzipped if we have to @@ -85,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; -- cgit v1.2.3 From 2d911974d751334f4c6ca1bc3b0f3f98e220436e Mon Sep 17 00:00:00 2001 From: Automatic Build Number Updater Date: Thu, 24 Nov 2011 12:22:07 -0700 Subject: Automated update of .build_number to 183 for branch master Last update: 94eef9eaecbdcc98f4b5adb0da939480a324b0ad (2 commits ago) --- .build_number | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3