- updated to 5.6.40

[packages/php.git] / php-fpm-config.patch

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index cb2b91d853abf8d54a949a632d60fe3b88f1cc00..69a93713d08d6570a8311bc479cb20fc460808e1 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -29,8 +29,8 @@
 +;  - 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/php-fpm.conf-d.in~      2015-02-04 19:26:16.000000000 +0200
++++ php-5.6.5/sapi/fpm/php-fpm.conf-d.in       2015-02-04 19:27:25.275218535 +0200
 @@ -32,7 +32,7 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
@@ -40,7 +40,7 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -41,9 +41,9 @@
+@@ -46,9 +46,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0660
@@ -50,9 +50,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.