Permalink
Browse files

Merge branch 'MDL-24684_20' of git://github.com/stronk7/moodle into M…

…OODLE_20_STABLE
  • Loading branch information...
2 parents add39c5 + 910c941 commit 4a7e2298a3e0edca4a8e28e916261f0ba2805717 Sam Hemelryk committed Jun 30, 2011
Showing with 6 additions and 0 deletions.
  1. +3 −0 backup/controller/backup_controller.class.php
  2. +3 −0 backup/controller/restore_controller.class.php
View
3 backup/controller/backup_controller.class.php
@@ -290,6 +290,9 @@ public function get_logger() {
* @return void Throws and exception of completes
*/
public function execute_plan() {
+ // Basic/initial prevention against time/memory limits
+ set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
+ raise_memory_limit(MEMORY_EXTRA);
return $this->plan->execute();
}
View
3 backup/controller/restore_controller.class.php
@@ -296,6 +296,9 @@ public function get_logger() {
}
public function execute_plan() {
+ // Basic/initial prevention against time/memory limits
+ set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
+ raise_memory_limit(MEMORY_EXTRA);
return $this->plan->execute();
}

0 comments on commit 4a7e229

Please sign in to comment.