diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-28 12:15:04 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-28 12:15:04 -0200 |
| commit | 5acce70485914b0f79df3a675c21d39a0079b89e (patch) | |
| tree | 0804b15fa666a0093f6e6ee4bd9357c76afb049d | |
| parent | e48a7cf4b1e7aa4de910641654081231f2dcb9b0 (diff) | |
| download | pfsense-5acce70485914b0f79df3a675c21d39a0079b89e.zip pfsense-5acce70485914b0f79df3a675c21d39a0079b89e.tar.gz | |
Fix sapi name check to detect if it's on console, ticket #4049
| -rw-r--r-- | etc/inc/config.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 721427c..a562c6f 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -50,13 +50,13 @@ if (!function_exists('platform_booting')) // return; // 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 +// 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/_! -if(!$ARCH) +if(!$ARCH) $ARCH = php_uname("m"); // Set memory limit to 256M on amd64. -if($ARCH == "amd64") +if($ARCH == "amd64") ini_set("memory_limit","256M"); else ini_set("memory_limit","128M"); @@ -86,7 +86,7 @@ if(file_exists("/debugging")) { $g['debug'] = true; } -if(platform_booting() && php_sapi_name() != 'fpm-cgi') { +if(platform_booting() && php_sapi_name() != 'fpm-fcgi') { echo "."; if(file_exists("/cf/conf/config.xml")) { $config_contents = file_get_contents("/cf/conf/config.xml"); |
