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 85890fa..991e0e3 100644 (file)
--- 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 34dd701..1fb2cc8 100644 (file)
--- 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