summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-08-17 16:49:30 +0000
committerNathan Kinkade <nath@nkinka.de>2012-08-17 16:49:30 +0000
commitb76a96ff97b73427e33bf6323cdc703a73612124 (patch)
treee4536c9ce60f38fd7bfa403a1882e5d1db9c9724 /modules
parentc6047a18fe13df2fc5bae7f9b2c7c5df30446bc1 (diff)
parent4001c1088c51f53a57ddcaa9a56e94f000dd7cdb (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/controllers/combined.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index cd84cb42..80ae1e2d 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -50,7 +50,7 @@ class Combined_Controller extends Controller {
if ($input->server("HTTP_IF_MODIFIED_SINCE")) {
header('HTTP/1.0 304 Not Modified');
header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
- header("Cache-Control: max-age=2678400");
+ header("Cache-Control: public,max-age=2678400");
header('Pragma: public');
Kohana::close_buffers(false);
return "";
@@ -83,7 +83,7 @@ class Combined_Controller extends Controller {
header("Content-Type: text/css; charset=UTF-8");
}
header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
- header("Cache-Control: max-age=2678400");
+ header("Cache-Control: public,max-age=2678400");
header("Pragma: public");
header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
header("Content-Length: " . strlen($content));