diff options
| author | Ermal <eri@pfsense.org> | 2013-12-20 22:32:21 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-12-20 22:32:21 +0000 |
| commit | 362ec35df2999b4ab75c72473c0b3c938070c2bc (patch) | |
| tree | af39baa4761f8804c08e8fe33dd9614c1b7776d3 /etc | |
| parent | aa205c3b69bf76b1565fd42dba83c7637212f793 (diff) | |
| download | pfsense-362ec35df2999b4ab75c72473c0b3c938070c2bc.zip pfsense-362ec35df2999b4ab75c72473c0b3c938070c2bc.tar.gz | |
Do not register the _ENV superglobal since its not required and probably not very useful in a [F]CGI world and its limit is restricted nowdays in pfSense.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.lib.inc | 5 | ||||
| -rwxr-xr-x | etc/rc.newwanipv6 | 10 | ||||
| -rwxr-xr-x | etc/rc.php_ini_setup | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/etc/inc/config.lib.inc b/etc/inc/config.lib.inc index 8d80e98..17984ee 100644 --- a/etc/inc/config.lib.inc +++ b/etc/inc/config.lib.inc @@ -876,10 +876,9 @@ function set_device_perms() { function get_config_user() { if (empty($_SESSION["Username"])) { - if (empty($_ENV['USER']) || $_ENV['USER'] == "root") + $username = getenv("USER"); + if (empty($conuser) || $conuser == "root") $username = "(system)"; - else - $username = $_ENV['USER']; } else $username = $_SESSION["Username"]; diff --git a/etc/rc.newwanipv6 b/etc/rc.newwanipv6 index 1b02aa8..dec1736 100755 --- a/etc/rc.newwanipv6 +++ b/etc/rc.newwanipv6 @@ -85,8 +85,9 @@ if (empty($curwanipv6) || !is_ipaddrv6($curwanipv6)) { exit; } -if (!empty($_ENV['new_domain_name_servers'])) { - $name_servers = explode(" ", $_ENV['new_domain_name_servers']); +$new_domain_name_servers = getenv("new_domain_name_servers"); +if (!empty($new_domain_name_servers)) { + $name_servers = explode(" ", $new_domain_name_servers); $valid_ns = array(); foreach($name_servers as $ns) { if (is_ipaddrv6(trim($ns))) @@ -96,8 +97,9 @@ if (!empty($_ENV['new_domain_name_servers'])) { if (count($valid_ns > 0)) file_put_contents("{$g['varetc_path']}/nameserver_v6{$interface}", implode("\n", $valid_ns)); } -if (!empty($_ENV['new_domain_name'])) - file_put_contents("{$g['varetc_path']}/searchdomain_v6{$interface}", $_ENV['new_domain_name']); +$new_domain_name = getenv("new_domain_name"); +if (!empty($new_domain_name)) + file_put_contents("{$g['varetc_path']}/searchdomain_v6{$interface}", $new_domain_name); /* write current WAN IPv6 to file */ file_put_contents("{$g['vardb_path']}/{$interface}_ipv6", $curwanipv6); diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup index 7da05b4..7cda247 100755 --- a/etc/rc.php_ini_setup +++ b/etc/rc.php_ini_setup @@ -179,6 +179,7 @@ max_execution_time = 900 max_input_time = 1800 register_argc_argv = On register_long_arrays = Off +variables_order = "GPCS" file_uploads = On upload_tmp_dir = ${UPLOADTMPDIR} upload_max_filesize = 200M |
