summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <ermal.luci@gmail.com>2012-07-22 05:34:26 -0700
committerErmal Luçi <ermal.luci@gmail.com>2012-07-22 05:34:26 -0700
commitbef15e06ed8da457cb3ba8b68b7811581e120f69 (patch)
tree36814cd270fcbb4c168904c2d3807552f1586a1e
parent2830a0e738d26f2a48f0c79c60b20f0cd485d0fc (diff)
parent4e3158362dd5a4db1df03422a1f924b7af9b137b (diff)
downloadpfsense-bef15e06ed8da457cb3ba8b68b7811581e120f69.zip
pfsense-bef15e06ed8da457cb3ba8b68b7811581e120f69.tar.gz
Merge pull request #183 from phil-davis/master
Remove unused set_time_limit in php.ini
-rwxr-xr-xetc/rc.php_ini_setup3
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 4342b93..a14de35 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -54,7 +54,7 @@ fi
if [ "$AVAILMEM" -lt "96" ]; then
APCSHMEMSIZE="5M"
fi
-if [ "$AVAILMEM" -lt "128" ]; then
+if [ "$AVAILMEM" -le "128" ]; then
APCSHMEMSIZE="10M"
fi
if [ "$AVAILMEM" -gt "128" ]; then
@@ -170,7 +170,6 @@ implicit_flush = true
magic_quotes_gpc = Off
max_execution_time = 900
max_input_time = 1800
-set_time_limit = 3600
register_argc_argv = On
file_uploads = On
upload_tmp_dir = ${UPLOADTMPDIR}
OpenPOWER on IntegriCloud