diff options
author | NewEraCracker <neweracracker@gmail.com> | 2016-08-16 16:43:35 +0100 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-09-02 10:28:42 -0300 |
commit | b9e9778a5bdac6ffbfd375a60b8cd8c26257640c (patch) | |
tree | 0eb60019b4bc9c286a0a358b21fd29c8f1256a5d | |
parent | 02809cc60285c3e6ff4f3c6e338be91981083310 (diff) | |
download | pfsense-b9e9778a5bdac6ffbfd375a60b8cd8c26257640c.zip pfsense-b9e9778a5bdac6ffbfd375a60b8cd8c26257640c.tar.gz |
Uniformize memory limits and remove old code (revised)
1) Allow setting a memory_limit up to 768M (Suhosin)
2) Remove old workarounds. Memory limits on config.inc will be new defaults
(cherry picked from commit 7edcc54b2e9d1de51d5e6d0aedade89bc2cf0699)
-rwxr-xr-x | src/etc/rc.php_ini_setup | 2 | ||||
-rw-r--r-- | src/usr/local/www/services_dhcpv6.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/services_router_advertisements.php | 5 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index e2e5901..7736110 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -301,7 +301,7 @@ suhosin.post.max_value_length = 500000 suhosin.request.max_array_index_length = 256 suhosin.request.max_vars = 5000 suhosin.request.max_value_length = 500000 -suhosin.memory_limit = 536870912 +suhosin.memory_limit = 805306368 EOF diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 6bc39de..d786ca4 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -107,11 +107,6 @@ if (!$g['services_dhcp_server_enable']) { exit; } -/* Fix failover DHCP problem - * http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749 - */ -ini_set("memory_limit", "64M"); - $if = $_GET['if']; if ($_POST['if']) { $if = $_POST['if']; diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index bd031e2..326050b 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -70,11 +70,6 @@ if (!$g['services_dhcp_server_enable']) { exit; } -/* Fix failover DHCP problem - * http://article.gmane.org/gmane.comp.security.firewalls.pfsense.support/18749 - */ -ini_set("memory_limit", "64M"); - $if = $_GET['if']; if ($_POST['if']) { $if = $_POST['if']; |