com php-src: Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src: run-tests.php sapi/fpm/config.m4 sapi/fpm/fpm/fpm_main.c

Commit: 998f506b6d06d85e5d7a1c446915170dfdd45845 Author: Antony Dovgal <tony2001@php.net> Thu, 16 Jan 2014 17:36:03 +0400 Parents: 7691926bbeb8c36b2a8f19f18d4f9129fcd4c08a e9883779a0d00fef3481af2806a918abe33fd3f4 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=998f506b6d06d85e5d7a1c446915170dfdd45845 Log: Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src * 'fpm-apparmor-fixed' of https://github.com/notti/php-src: Add some basic and apparmor tests to fpm Add --force-stderr to fpm Add apparmor change hat functionality to fpm Changed paths: MM run-tests.php MM sapi/fpm/config.m4 MM sapi/fpm/fpm/fpm_main.c Diff: diff --cc sapi/fpm/config.m4 index bd6d649,87c5a60..ba2b8e2 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@@ -555,13 -571,14 +571,14 @@@ if test "$PHP_FPM" != "no"; the AC_FPM_EPOLL AC_FPM_POLL AC_FPM_SELECT + AC_FPM_APPARMOR PHP_ARG_WITH(fpm-user,, - [ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no) + [ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no) PHP_ARG_WITH(fpm-group,, - [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this - should usually be set to match the fpm username (default: nobody)], nobody, no) + [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this + should usually be set to match the fpm username (default: nobody)], nobody, no) PHP_ARG_WITH(fpm-systemd,, [ --with-fpm-systemd Activate systemd integration], no, no)