diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 14:30:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-29 14:30:55 +0100 |
| commit | 32085e40b6b8aba31a3f528f0716a26949e48604 (patch) | |
| tree | f8f4948714af83aea468b20652bd74aae3bd7f01 /package | |
| parent | 14bc50bfa1225afa28e9d2da59918939310e2cef (diff) | |
| parent | 9a7f9ec21459b4c51b3b27fa48a7f25bd83a4253 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/php/Makefile | 2 | ||||
| -rw-r--r-- | package/php/files/php.ini | 2 | ||||
| -rw-r--r-- | package/php/files/php.init | 2 |
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 |