diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-12-14 09:56:34 -0200 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-12-14 09:56:34 -0200 |
| commit | c92ccac76ff2938c5718440efdd846317f6a2d55 (patch) | |
| tree | 1dd190505af25191f0289552a155732d7432da58 /etc/inc/config.inc | |
| parent | 386447eaa7cfe727678455955285b1ecd4e6e9f9 (diff) | |
| parent | c9b08a50f0ba328ac0569247eb2063d34f7e6279 (diff) | |
| download | pfsense-c92ccac76ff2938c5718440efdd846317f6a2d55.zip pfsense-c92ccac76ff2938c5718440efdd846317f6a2d55.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/filter.inc
etc/inc/gwlb.inc
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
etc/inc/shaper.inc
etc/inc/upgrade_config.inc
etc/inc/xmlparse.inc
usr/local/www/fbegin.inc
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 98592c9..b01fa13 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/sysctl /sbin/umount /sbin/halt /sbin/fsck /bin/sync + pfSense_BUILDER_BINARIES: /sbin/mount /sbin/sysctl /sbin/umount /sbin/halt /sbin/fsck pfSense_MODULE: config */ @@ -48,10 +48,17 @@ if($g['booting']) echo "."; //if (in_array("/etc/inc/config.inc", get_included_files())) // return; -// Set the memory limit to 128M. When someone has something like 500+ tunnels +// Set the memory limit to 128M on i386. When someone has something like 500+ tunnels // the parser needs quite a bit of ram. Do not remove this line unless you // know what you are doing. If in doubt, check with dev@ _/FIRST/_! -ini_set("memory_limit","128M"); +if(!$ARCH) + $ARCH = php_uname("m"); + +// Set memory limit to 256M on amd64. +if($ARCH == "amd64") + ini_set("memory_limit","256M"); +else + ini_set("memory_limit","128M"); /* include globals from notices.inc /utility/XML parser files */ require_once("notices.inc"); |
