From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 18 Aug 2004 05:45:25 +0000 (+0000)
Subject: Use ob_implicit_flush() rather than ob_end_flush() in install-utils.
X-Git-Tag: 1.5.0alpha1~2301
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=2f60c52a3c86250d08e3c3b60e67529ad580fc84;p=lhc%2Fweb%2Fwiklou.git

Use ob_implicit_flush() rather than ob_end_flush() in install-utils.
Ending the buffering completely will kill all subsequent output when
PHP is globally configured to run through a gzip compression handler.

Also, suppress the warning in LocalSettings.php when PHP tells us we
can't run the gzip filter twice.
---

diff --git a/config/index.php b/config/index.php
index 85890fa642..991e0e3607 100644
--- a/config/index.php
+++ b/config/index.php
@@ -827,7 +827,7 @@ if ( \$wgCommandLineMode ) {
 	}
 } elseif ( empty( \$wgConfiguring ) ) {
 	## Compress output if the browser supports it
-	{$zlib}if( !ini_get( 'zlib.output_compression' ) ) ob_start( 'ob_gzhandler' );
+	{$zlib}if( !ini_get( 'zlib.output_compression' ) ) @ob_start( 'ob_gzhandler' );
 }
 
 \$wgSitename         = \"{$slconf['Sitename']}\";
diff --git a/install-utils.inc b/install-utils.inc
index 34dd701762..1fb2cc8e82 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,8 +1,9 @@
 <?php
 
 function install_version_checks() {
-	# Turn off output buffering if it's on
-	@ob_end_flush();
+	# We dare not turn output buffer _off_ since this will break completely
+	# if PHP is globally configured to run through a gzip filter.
+	@ob_implicit_flush( true );
 	
 	if( !function_exists( "version_compare" ) ) {
 		# version_compare was introduced in 4.1.0