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

3 files changed, 1 insertions, 11 deletions

diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index d1ea413..756b324 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -266,7 +266,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 7bcc846..9f22a7c 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -75,11 +75,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 e2df3e4..d43a29c 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -38,11 +38,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'];