[Fusionforge-commits] r12053 - in branches/Branch_5_1/src: db plugins/mediawiki/bin plugins/wiki/www/lib/plugin
Roland Mas
lolando at libremir.placard.fr.eu.org
Fri Jan 21 14:20:08 CET 2011
Author: lolando
Date: 2011-01-21 14:20:06 +0100 (Fri, 21 Jan 2011)
New Revision: 12053
Modified:
branches/Branch_5_1/src/db/upgrade-db.php
branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php
branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php
Log:
Merged from Evolvis: improve flushing output buffers
Modified: branches/Branch_5_1/src/db/upgrade-db.php
===================================================================
--- branches/Branch_5_1/src/db/upgrade-db.php 2011-01-21 13:17:54 UTC (rev 12052)
+++ branches/Branch_5_1/src/db/upgrade-db.php 2011-01-21 13:20:06 UTC (rev 12053)
@@ -13,7 +13,7 @@
*/
if (version_compare(phpversion(), '4.3.0', '<') || php_sapi_name() == 'cgi') {
// Handle output buffering
- @ob_end_flush();
+ while (@ob_end_flush());
ob_implicit_flush(TRUE);
// PHP ini settings
Modified: branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php
===================================================================
--- branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php 2011-01-21 13:17:54 UTC (rev 12052)
+++ branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php 2011-01-21 13:20:06 UTC (rev 12053)
@@ -63,7 +63,7 @@
array_unshift ($argv, $mwscript, '--conf', $gfplugins . 'mediawiki/www/LocalSettings.php') ;
-ob_end_flush() ;
+while (@ob_end_flush());
require_once $mwscript ;
Modified: branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php
===================================================================
--- branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php 2011-01-21 13:17:54 UTC (rev 12052)
+++ branches/Branch_5_1/src/plugins/wiki/www/lib/plugin/PageDump.php 2011-01-21 13:20:06 UTC (rev 12053)
@@ -112,7 +112,7 @@
// Content-Type, Set-Cookie, Cache-control, ...
$request->discardOutput(); // Hijack the http request from PhpWiki.
ob_end_clean(); // clean up after hijacking $request
- //ob_end_flush(); //debugging
+ //while (@ob_end_flush()); //debugging
$filename = FilenameForPage($page);
Header("Content-disposition: attachment; filename=\""
. $filename . "\"");
More information about the Fusionforge-commits
mailing list