X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-fpm-config.patch;h=11b9933f6a1c64a7c0badea7904723838f35c91f;hp=cb2b91d853abf8d54a949a632d60fe3b88f1cc00;hb=954ecf20c48c9867c06e3142115d609ad4c9e81c;hpb=614808e04f2c37a7ad7e880d8a25843692d47425 diff --git a/php-fpm-config.patch b/php-fpm-config.patch index cb2b91d..11b9933 100644 --- a/php-fpm-config.patch +++ b/php-fpm-config.patch @@ -1,5 +1,5 @@ ---- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200 -+++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200 +--- php-7.1.0beta3/sapi/fpm/php-fpm.conf.in~ 2016-08-19 09:48:00.000000000 +0300 ++++ php-7.1.0beta3/sapi/fpm/php-fpm.conf.in 2016-08-31 13:59:19.139523160 +0300 @@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ @@ -9,7 +9,7 @@ ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written - ; in a local file. + ; into a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log @@ -17,31 +17,19 @@ ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities -@@ -115,3 +115,11 @@ - ; ports and different management options. The name of the pool will be - ; used in logs and stats. There is no limitation on the number of pools which - ; FPM can handle. Your system will tell you anyway :) -+ -+; Include one or more files. If glob(3) exists, it is used to include a bunch of -+; files from a glob(3) pattern. This directive can be used everywhere in the -+; file. -+; Relative path can also be used. They will be prefixed by: -+; - the global prefix if it's been set (-p argument) -+; - @prefix@ otherwise -+include=/etc/php/fpm.d/*.conf ---- php-5.6.2.old/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:07:47.762117299 +0200 -+++ php-5.6.2/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:23:41.232196777 +0200 +--- php-5.6.5/sapi/fpm/www.conf.in~ 2015-02-04 19:26:16.000000000 +0200 ++++ php-5.6.5/sapi/fpm/www.conf.in 2015-02-04 19:27:25.275218535 +0200 @@ -32,7 +32,7 @@ - ; specific port; + ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = 127.0.0.1:9000 +listen = /var/run/php/@processname@.sock ; Set listen(2) backlog. - ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) -@@ -41,9 +41,9 @@ - ; BSD-derived systems allow connections regardless of permissions. + ; Default Value: 511 (-1 on FreeBSD and OpenBSD) +@@ -46,9 +46,9 @@ + ; and group can be specified either by name or by their numeric IDs. ; Default Values: user and group are set as the running user ; mode is set to 0660 -;listen.owner = @php_fpm_user@ @@ -50,9 +38,9 @@ +listen.owner = root +listen.group = @php_fpm_group@ +listen.mode = 0660 - - ; List of ipv4 addresses of FastCGI clients which are allowed to connect. - ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original + ; When POSIX Access Control Lists are supported you can set them using + ; these options, value is a comma separated list of user/group names. + ; When set, listen.owner and listen.group are ignored @@ -53,7 +53,7 @@ ; must be separated by a comma. If this value is left blank, connections will be ; accepted from any ip address. @@ -82,16 +70,18 @@ ths = document.getElementsByTagName("th"); for (var i=0; i