diff options
| author | Scott Ullrich <sullrich@gmail.com> | 2012-06-09 09:40:36 -0700 |
|---|---|---|
| committer | Scott Ullrich <sullrich@gmail.com> | 2012-06-09 09:40:36 -0700 |
| commit | 63c654a49e788f83a7ffb19d7e009585f62c7bc8 (patch) | |
| tree | 1316ed874bb0c2b22ad9351cd50e3e80896cb4b2 | |
| parent | fa3e5c05fa1f5c4d2a3d4c2f6cbcd798e35bb8b2 (diff) | |
| parent | f53ff9ff6b08f6ab3c0488a29d5507c1ded53ffc (diff) | |
| download | pfsense-63c654a49e788f83a7ffb19d7e009585f62c7bc8.zip pfsense-63c654a49e788f83a7ffb19d7e009585f62c7bc8.tar.gz | |
Merge pull request #134 from bcyrill/patch-1
Removed unused maxproc parameter
| -rw-r--r-- | etc/inc/captiveportal.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 85e1721..45f1402 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -442,11 +442,6 @@ function captiveportal_init_webguis($cpcfg) { if (!isset($cpcfg['enable'])) return; - if ($cpcfg['maxproc']) - $maxproc = $cpcfg['maxproc']; - else - $maxproc = 16; - $use_fastcgi = true; if (isset($cpcfg['httpslogin'])) { @@ -460,14 +455,14 @@ function captiveportal_init_webguis($cpcfg) { $listenporthttps = $cpcfg['listenporthttps'] ? $cpcfg['listenporthttps'] : ($cpcfg['zoneid'] + 1); system_generate_lighty_config("{$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal-SSL.conf", $cert, $key, $cacert, "lighty-{$cpzone}-CaptivePortal-SSL.pid", $listenporthttps, "/usr/local/captiveportal", - "cert-portal.pem", "ca-portal.pem", "1", $maxproc, $use_fastcgi, $cpzone); + "cert-portal.pem", "ca-portal.pem", "1", $use_fastcgi, $cpzone); } /* generate lighttpd configuration */ $listenporthttp = $cpcfg['listenporthttp'] ? $cpcfg['listenporthttp'] : $cpcfg['zoneid']; system_generate_lighty_config("{$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf", "", "", "", "lighty-{$cpzone}-CaptivePortal.pid", $listenporthttp, "/usr/local/captiveportal", - "cert-portal.pem", "ca-portal.pem", "1", $maxproc, $use_fastcgi, $cpzone); + "cert-portal.pem", "ca-portal.pem", "1", $use_fastcgi, $cpzone); /* attempt to start lighttpd */ $res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf"); |
