summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-10-03 09:25:33 +0000
committeralecpl <alec@alec.pl>2011-10-03 09:25:33 +0000
commite877681c2001c78809a43bbccdb728142e8e59da (patch)
tree59da7d47886f2b407932b20d2c256500f17a96a9
parente750d1b8164a7a1e584c77d3ef4113b4fcf3da39 (diff)
- Disable time limit for CLI scripts (#1488109)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/clisetup.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f7fb73f21..df67dd8f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Disable time limit for CLI scripts (#1488109)
- Fix misleading display when chaning editor type (#1488104)
- Add loading indicator on contact delete
- Fix bug where after delete message rows can be added to the list of another folder (#1487752)
diff --git a/program/include/clisetup.php b/program/include/clisetup.php
index 7a818110e..01d7291ec 100644
--- a/program/include/clisetup.php
+++ b/program/include/clisetup.php
@@ -25,6 +25,8 @@ if (php_sapi_name() != 'cli') {
require_once INSTALL_PATH . 'program/include/iniset.php';
+// Unset max. execution time limit, set to 120 seconds in iniset.php
+@set_time_limit(0);
/**
* Parse commandline arguments into a hash array