From: henoheno <henoheno>
Date: Wed, 26 Jan 2005 13:26:37 +0000 (+0900)
Subject: if(defined('PKWK_ZLIB_LOADABLE_MODULE'))
X-Git-Tag: r1_5_0_rc1~542
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8adfe99b9dd1d39276256b131bab062121b45ff6;hp=23e78d6cd3bfc7f77ee748902a1b186db87e6375;p=pukiwiki%2Fpukiwiki.git

if(defined('PKWK_ZLIB_LOADABLE_MODULE'))
---

diff --git a/lib/html.php b/lib/html.php
index aafb63a..35ab9dd 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: html.php,v 1.26 2005/01/12 14:02:36 henoheno Exp $
+// $Id: html.php,v 1.27 2005/01/26 13:26:37 henoheno Exp $
 //
 // HTML-publishing related functions
 
@@ -380,11 +380,15 @@ function pkwk_common_headers()
 {
 	if (! PKWK_OPTIMISE) pkwk_headers_sent();
 
-	$matches = array();
-	if(ini_get('zlib.output_compression') &&
-	    preg_match('/\b(gzip|deflate)\b/i', $_SERVER['HTTP_ACCEPT_ENCODING'], $matches)) {
-		header('Content-Encoding: ' . $matches[1]);
-		header('Vary: Accept-Encoding');
+	if(defined('PKWK_ZLIB_LOADABLE_MODULE')) {
+		$matches = array();
+		if(ini_get('zlib.output_compression') &&
+		    preg_match('/\b(gzip|deflate)\b/i', $_SERVER['HTTP_ACCEPT_ENCODING'], $matches)) {
+		    	// Bug #29350 output_compression compresses everything _without header_ as loadable module
+		    	// http://bugs.php.net/bug.php?id=29350
+			header('Content-Encoding: ' . $matches[1]);
+			header('Vary: Accept-Encoding');
+		}
 	}
 }