Move the ini_set() to bump the PHP memory limit to 32MB into config.inc

which is the first place this will trigger the memory limit.

4 files changed, 9 insertions, 3 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index d553cb4..afa8c69 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -38,6 +38,13 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
+/* Set memory limit to 32MB, this is required for large configurations
+ * A XML config of about 500KB will trigger the default of 12MB
+ * Setting the memory_limit parameter in the php.ini does not seem to
+ * take any effect. Also, that would be too late in the boot process
+ */
+ini_set("memory_limit","32M");
+
 if($g['booting']) echo ".";
 
 /* do not load this file twice. */
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index bbbb32d..fba2fae 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -77,7 +77,6 @@ function filter_configure() {
 /* reload filter sync */
 function filter_configure_sync() {
 	global $config, $g, $after_filter_configure_run;
-	ini_set("memory_limit","32M");
 	filter_pflog_start();
 	update_filter_reload_status("Initializing");
 	/* invalidate interface cache */
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index c3dfa8c..10b5f6a 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -60,6 +60,7 @@ implicit_flush = true
 magic_quotes_gpc = Off
 max_execution_time = 99999999
 max_input_time = 99999999
+memory_limit = 32M
 register_argc_argv = On
 file_uploads = On
 extension_dir=/usr/local/lib/php/extensions/no-debug-non-zts-20020429/
@@ -1264,4 +1265,4 @@ function enable_watchdog() {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/etc/rc.bootup b/etc/rc.bootup
index cbf474d..4ce4d5e 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -32,7 +32,6 @@
 */
 
 	echo " done.\n";
-	ini_set("memory_limit","32M");
 	echo "Initializing...";
 	echo ".";
 	require_once("/etc/inc/globals.inc");