From: Antony Dovgal Date: Thu, 16 Jan 2014 13:36:03 +0000 (+0400) Subject: Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src X-Git-Tag: PRE_PHPNG_MERGE~388^2~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=998f506b6d06d85e5d7a1c446915170dfdd45845;p=php 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 --- 998f506b6d06d85e5d7a1c446915170dfdd45845 diff --cc sapi/fpm/config.m4 index bd6d64930b,87c5a60c50..ba2b8e2d82 --- 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)