summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-01-04 09:04:25 +0000
committerErmal <eri@pfsense.org>2013-01-04 09:04:25 +0000
commit56ef4d26e8a99b5b7918f4e94cde6cadad3d429e (patch)
tree24e42e7ab986ac8da5a646a26a4a9ef7f4a01375
parent0b85e97dfa14293dc4a3999a2c9ecd5087973a07 (diff)
downloadpfsense-56ef4d26e8a99b5b7918f4e94cde6cadad3d429e.zip
pfsense-56ef4d26e8a99b5b7918f4e94cde6cadad3d429e.tar.gz
Always use fastcgi since the requirement is the same anyhow
-rw-r--r--etc/inc/system.inc20
1 files changed, 4 insertions, 16 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 8fc6742..633abbe 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -759,10 +759,6 @@ function system_generate_lighty_config($filename,
$memory = get_memory();
$avail = $memory[0];
- if($avail > 0 and $avail < 65) {
- $fast_cgi_enable = false;
- }
-
// Ramp up captive portal max procs
// Work relative to the default of 2, for values that would be >2.
if($captive_portal == true) {
@@ -781,17 +777,10 @@ function system_generate_lighty_config($filename,
if($avail > 383) {
$max_procs += 3;
}
- }
-
- if ($avail > 0 and $avail < 128) {
- $bin_environment = <<<EOC
- "bin-environment" => (
- "PHP_FCGI_CHILDREN" => "1",
- "PHP_FCGI_MAX_REQUESTS" => "500",
- ),
+ } else if ($avail > 135)
+ $max_procs = 2;
-EOC;
- } else if ($captive_portal == true) {
+ if ($captive_portal == true) {
$bin_environment = <<<EOC
"bin-environment" => (
"PHP_FCGI_CHILDREN" => "{$max_procs}",
@@ -802,7 +791,7 @@ EOC;
} else
$bin_environment = <<<EOC
"bin-environment" => (
- "PHP_FCGI_CHILDREN" => "{$max_procs}",
+ "PHP_FCGI_CHILDREN" => "1",
"PHP_FCGI_MAX_REQUESTS" => "500"
),
EOC;
@@ -814,7 +803,6 @@ fastcgi.server = ( ".php" =>
( "localhost" =>
(
"socket" => "{$g['tmp_path']}/php-fastcgi.socket",
- "min-procs" => 0,
"max-procs" => {$max_procs},
{$bin_environment}
"bin-path" => "/usr/local/bin/php"
OpenPOWER on IntegriCloud