summaryrefslogtreecommitdiff
path: root/package/php/files
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
commit8e8512391c668fc7074f812f15eabe8f176fb01e (patch)
treef9f0862dd6eb962fe3fc4803180b431843f6c5be /package/php/files
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/php/files')
-rw-r--r--package/php/files/php.ini2
-rw-r--r--package/php/files/php.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/php/files/php.ini b/package/php/files/php.ini
index c9b395ac1..3a5172b3c 100644
--- a/package/php/files/php.ini
+++ b/package/php/files/php.ini
@@ -53,7 +53,7 @@ expose_php = On
max_execution_time = 30 ; Maximum execution time of each script, in seconds
max_input_time = 60 ; Maximum amount of time each script may spend parsing request data
-memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)
+memory_limit = 32M ; Maximum amount of memory a script may consume (8MB)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/package/php/files/php.init b/package/php/files/php.init
index 210db4ad8..6d566d960 100644
--- a/package/php/files/php.init
+++ b/package/php/files/php.init
@@ -15,7 +15,7 @@ start)
/usr/bin/php ${php_flags} &
;;
stop)
- kill $(pgrep -f /usr/bin/php)
+ for i in $(pgrep -f /usr/bin/php);do kill -9 $i;done
;;
restart)
sh $0 stop