X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=513f59346c8c8fdc121b9f1b3726008380698bcf;hb=9c85176cec5be2054e04521e80486165d4901b3a;hp=7a5a5d8489cf80588b35aefb004f8b670e8ce95f;hpb=743eca95e3065abf3091d343a4ab88ee4508483a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7a5a5d8489..513f59346c 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1845,7 +1845,7 @@ function wfHttpError( $code, $label, $desc ) {
 function wfResetOutputBuffers( $resetGzipEncoding = true ) {
 	if ( $resetGzipEncoding ) {
 		// Suppress Content-Encoding and Content-Length
-		// headers from 1.10+s wfOutputHandler
+		// headers from OutputHandler::handle.
 		global $wgDisableOutputCompression;
 		$wgDisableOutputCompression = true;
 	}
@@ -3019,7 +3019,7 @@ function wfWaitForSlaves(
 	$ifWritesSince = null, $wiki = false, $cluster = false, $timeout = null
 ) {
 	if ( $timeout === null ) {
-		$timeout = wfIsCLI() ? 86400 : 10;
+		$timeout = wfIsCLI() ? 60 : 10;
 	}
 
 	if ( $cluster === '*' ) {