php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login | |
Patch posix-acl.patch for FPM related Bug #68526Patch version 2014-11-30 16:50 UTC Return to Bug #68526 | Download this patchThis patch is obsolete Obsoleted by patches: This patch renders other patches obsolete Obsolete patches: Patch Revisions: 2014-11-30 17:34 UTC | 2014-11-30 16:50 UTC | 2014-11-30 10:31 UTC | 2014-11-30 09:56 UTC | 2014-11-30 09:44 UTC | 2014-11-30 09:21 UTC | 2014-11-30 08:35 UTCDeveloper: remi@php.netdiff -ru /home/php/php-src/sapi/fpm/config.m4 sapi/fpm/config.m4 --- /home/php/php-src/sapi/fpm/config.m4 2014-11-24 09:31:58.000000000 +0100 +++ sapi/fpm/config.m4 2014-11-30 18:31:27.193354685 +0100 +++ sapi/fpm/config.m4 2014-11-29 17:27:07.173921156 +0100 @@ -583,6 +583,9 @@ PHP_ARG_WITH(fpm-systemd,, [ --with-fpm-systemd Activate systemd integration], no, no) Line 10 (now 10), was 15 lines, now 14 lines + if test "$PHP_FPM_SYSTEMD" != "no" ; then if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -624,6 +627,17 @@ @@ -624,6 +627,16 @@ else php_fpm_systemd=simple fi + + if test "$PHP_FPM_ACL" != "no" ; then + AC_CHECK_HEADERS([sys/acl.h]) + AC_CHECK_LIB(acl, acl_free, [ + PHP_ADD_LIBRARY(acl) + AC_DEFINE(HAVE_FPM_ACL, 1, [ POSIX Access Control List ]) + ],[ struct ini_value_parser_s { diff -ru /home/php/php-src/sapi/fpm/fpm/fpm_unix.c sapi/fpm/fpm/fpm_unix.c --- /home/php/php-src/sapi/fpm/fpm/fpm_unix.c 2014-11-29 16:52:25.000000000 +0100 +++ sapi/fpm/fpm/fpm_unix.c 2014-11-30 18:33:09.211756546 +0100 +++ sapi/fpm/fpm/fpm_unix.c 2014-11-30 17:26:22.803198128 +0100 @@ -21,6 +21,10 @@ #include <sys/apparmor.h> #endif +#ifdef HAVE_SYS_ACL_H +#ifdef HAVE_FPM_ACL +#include <sys/acl.h> +#endif + #include "fpm.h" |
Copyright © 2001-2024 The PHP Group All rights reserved. |
Last updated: Thu Apr 25 22:01:29 2024 UTC |