summaryrefslogtreecommitdiff
path: root/package/php
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-30 16:01:06 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-30 16:01:06 +0100
commitc3c50b45244d5c94e1b880b37c3da202ed70fceb (patch)
treeb76a992fe898a1e4e71ded2b4c0dded78cd4bd8a /package/php
parentfdeed9b0c762e9f700f3e45869ec58057da449a1 (diff)
parent61cc800e46cc943824dc6a0b8e8d413f2795db9f (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/php')
-rw-r--r--package/php/Makefile2
-rw-r--r--package/php/files/php.ini2
-rw-r--r--package/php/files/php.init2
3 files changed, 3 insertions, 3 deletions
diff --git a/package/php/Makefile b/package/php/Makefile
index 64bf3c013..7742b874b 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= php
PKG_VERSION:= 5.4.19
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9e7ad2494ba3de519328f74267de8342
PKG_DESCR:= PHP language interpreter
PKG_SECTION:= lang
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