diff options
Diffstat (limited to 'package/php')
| -rw-r--r-- | package/php/0007-avoid-bfin-gcc-segfault.patch | 16 | ||||
| -rw-r--r-- | package/php/php-fpm.conf | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/package/php/0007-avoid-bfin-gcc-segfault.patch b/package/php/0007-avoid-bfin-gcc-segfault.patch new file mode 100644 index 0000000000..4dccb25f1f --- /dev/null +++ b/package/php/0007-avoid-bfin-gcc-segfault.patch @@ -0,0 +1,16 @@ +Avoid gcc segmentation fault + +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> + +diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h +--- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200 ++++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100 +@@ -97,7 +97,7 @@ + + #if defined(ZEND_WIN32) && !defined(__clang__) + # define ZEND_ASSUME(c) __assume(c) +-#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT ++#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__) + # define ZEND_ASSUME(c) do { \ + if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \ + } while (0) diff --git a/package/php/php-fpm.conf b/package/php/php-fpm.conf index b75a58fefc..88014b8c80 100644 --- a/package/php/php-fpm.conf +++ b/package/php/php-fpm.conf @@ -1,9 +1,6 @@ [www] -# Only start children when there are requests to be processed pm = ondemand -# Terminate them again after there haven't been any for 2 minutes pm.process_idle_timeout = 120s -# Maximum number of children processing PHP requests concurrently pm.max_children = 5 listen = /var/run/php-fpm.sock |
