MDL-17458 fixing installation regressions - no output and timeout

diff --git a/admin/index.php b/admin/index.php
index c78c2efa71dd4f112584726460cc55213d07433c..3719835f0f29abe79eb9abff6fb64deb5a8d28a5 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -40,6 +40,7 @@ if (version_compare(phpversion(), '5.2.0') < 0) {
 
 // try to flush everything all the time
 @ob_implicit_flush(true);
+while(@ob_end_clean()); // ob_end_flush prevents sending of headers
 
 require('../config.php');
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions

diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index b0be5f44b1870c6da10b4b152760decd16833622..c6b5144719df837bc933b87b175ee780d341e509 100644 (file)
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1024,6 +1024,7 @@ function install_core($version, $verbose) {
     global $CFG, $DB;
 
     try {
+        set_time_limit(600);
         print_upgrade_part_start('moodle', true, $verbose); // does not store upgrade running flag
 
         $DB->get_manager()->install_from_xmldb_file("$CFG->libdir/db/install.xml");