diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-03 09:25:33 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-10-03 09:25:33 +0000 |
| commit | e4def8a1bd65cb1ae33d6c0e7c44f3f516c8edc8 (patch) | |
| tree | 21e668847403c74ce69ddc25528daddb059ea485 | |
| parent | b67b610524889a4ff8d6ce8281a1586172df28fb (diff) | |
- Disable time limit for CLI scripts (#1488109)
git-svn-id: https://svn.roundcube.net/trunk@5299 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/clisetup.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index f7fb73f21..df67dd8f7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/include/clisetup.php b/roundcubemail/program/include/clisetup.php index 7a818110e..01d7291ec 100644 --- a/roundcubemail/program/include/clisetup.php +++ b/roundcubemail/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 |