BugTrack/738 Don't output such headers to non-Accept-Encoding browsers

diff --git a/skin/pukiwiki.css.php b/skin/pukiwiki.css.php
index 2e416a3..439f47c 100644 (file)
--- a/skin/pukiwiki.css.php
+++ b/skin/pukiwiki.css.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.css.php,v 1.7 2004/11/01 12:56:50 henoheno Exp $
+// $Id: pukiwiki.css.php,v 1.8 2004/11/01 13:01:26 henoheno Exp $
 //
 header('Content-Type: text/css');
 $matches = array();
@@ -23,7 +23,6 @@ if ($media != 'print') $media = 'screen';
 ?>
 @charset "<?php echo $charset ?>";
 
-<?php exit; ?>
 pre, dl, ol, p, blockquote
 {
        line-height:130%;

diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index 44529a4..863cf41 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: pukiwiki.skin.php,v 1.15 2004/10/31 09:20:00 henoheno Exp $
+// $Id: pukiwiki.skin.php,v 1.16 2004/11/01 12:56:50 henoheno Exp $
 //
 
 // Prohibit direct access
@@ -41,7 +41,7 @@ switch(UI_LANG){
 header('Cache-control: no-cache');
 header('Pragma: no-cache');
 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
-if(ini_get('zlib.output_compression')) {
+if(ini_get('zlib.output_compression') && preg_match('/\bgzip\b/i', $_SERVER['HTTP_ACCEPT_ENCODING'])) {
        header('Content-Encoding: gzip');
        header('Vary: Accept-Encoding');
 }