From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Oct 2011 10:15:58 +0000 (+0200)
Subject: keep the explicit setting of memory_limit only in 3 pages
X-Git-Tag: plewww-4.3-68~2
X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=commitdiff_plain;h=2acd8f63883ad55c2c3c204d3b11db86da3417d2

keep the explicit setting of memory_limit only in 3 pages
remove the other instances that were actually limiting as compared to
modern limits - use php.ini to manage this at a system-qide level
---

diff --git a/planetlab/nodes/node_downloads.php b/planetlab/nodes/node_downloads.php
index d43ada6..c037c1a 100644
--- a/planetlab/nodes/node_downloads.php
+++ b/planetlab/nodes/node_downloads.php
@@ -1,7 +1,5 @@
 <?php
 
-  // $Id$
-
   // cleaned up, keep only the actions related to downloading stuff
   // REQUIRED : node_id=node_id
   // (*) action='download-node-floppy' : 
@@ -14,20 +12,7 @@
   // (*) action='download-generic-usb':
   //				: performs actual generic download
 
-// delivering node-dependant images requires larger memory limit
-// trial and error, based on the current sizes
-// generic-ISO 43980800 
-// generic-usb 44720128 
-// 256M OK
-// 128M OK
-// 96M OK
-// 88M KO
-// 80M KO
-// 64M KO
-// Bottom line is, looks like we need in the order of twice the file size
-// so let's play it safe
-// Thierry - for 4.2, we need a larger area, was 100 for 4.1
-ini_set("memory_limit","150M");
+ini_set("memory_limit","256M");
 
 // Require login
 require_once 'plc_login.php';
diff --git a/planetlab/nodes/nodes.php b/planetlab/nodes/nodes.php
index b2c51a7..8a858b7 100644
--- a/planetlab/nodes/nodes.php
+++ b/planetlab/nodes/nodes.php
@@ -28,7 +28,6 @@ drupal_set_html_head('
 ');
 
 
-ini_set("memory_limit","64M");
 //error_reporting(0);
 
 // -------------------- 
diff --git a/planetlab/persons/persons.php b/planetlab/persons/persons.php
index 3e134b5..ef04dcd 100644
--- a/planetlab/persons/persons.php
+++ b/planetlab/persons/persons.php
@@ -20,9 +20,6 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-//fix the memory limit for this page
-ini_set("memory_limit","64M");
-
 // -------------------- 
 // recognized URL arguments
 $peerscope=$_GET['peerscope'];
diff --git a/planetlab/slices/slice.php b/planetlab/slices/slice.php
index d29520e..d04d7dc 100644
--- a/planetlab/slices/slice.php
+++ b/planetlab/slices/slice.php
@@ -30,7 +30,6 @@ drupal_set_html_head('
 ');
 
 // -------------------- admins potentially need to get full list of users
-ini_set('memory_limit','32M');
 //error_reporting(0);
 
 $profiling=false;
diff --git a/planetlab/slices/slices.php b/planetlab/slices/slices.php
index 63245e9..2b10bc9 100644
--- a/planetlab/slices/slices.php
+++ b/planetlab/slices/slices.php
@@ -23,8 +23,6 @@ require_once 'linetabs.php';
 require_once 'table.php';
 require_once 'nifty.php';
 
-ini_set('memory_limit','48M');
-
 // -------------------- 
 // recognized URL arguments
 $peerscope=$_GET['peerscope'];