summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2008-09-05 12:20:57 +0000
committerSeth Mos <seth.mos@xs4all.nl>2008-09-05 12:20:57 +0000
commitec7f0db21693831556b9a7f2f041c39de65c9503 (patch)
tree189c3b105349b4f7e2aa6139ccc3161beff4cead /etc/inc/config.inc
parent0fa1cc579c5fe89156f20e29ce983539e18ffd5a (diff)
downloadpfsense-ec7f0db21693831556b9a7f2f041c39de65c9503.zip
pfsense-ec7f0db21693831556b9a7f2f041c39de65c9503.tar.gz
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.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc7
1 files changed, 7 insertions, 0 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. */
OpenPOWER on IntegriCloud