diff options
| author | Ermal <eri@pfsense.org> | 2010-06-01 17:35:27 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-06-01 17:35:27 +0000 |
| commit | 59cfe65d3cd4fd3b7208d0503f571759956b9021 (patch) | |
| tree | bc07080f457ddf62fbb6a20cf036c60ef766eb64 /etc | |
| parent | 924f202ee818c72b10855d3a1c06b34a9e7aa595 (diff) | |
| download | pfsense-59cfe65d3cd4fd3b7208d0503f571759956b9021.zip pfsense-59cfe65d3cd4fd3b7208d0503f571759956b9021.tar.gz | |
Do not set max_execution time here.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.lib.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 435949f..90968ad 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -359,7 +359,7 @@ function convert_config() { global $config, $g; $now = date("H:i:s"); log_error("Start Configuration upgrade at $now, set execution timeout to 15 minutes"); - ini_set("max_execution_time", "900"); + //ini_set("max_execution_time", "900"); /* special case upgrades */ /* fix every minute crontab bogons entry */ diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index cb690d6..a6486e3 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1669,7 +1669,7 @@ function upgrade_054_to_055() { global $g; /* RRD files changed for quality, traffic and packets graphs */ - ini_set("max_execution_time", "1800"); + //ini_set("max_execution_time", "1800"); /* convert traffic RRD file */ global $parsedcfg, $listtags; $listtags = array("ds", "v", "rra", "row"); |
