up to 5.6.27 - http://php.net/releases/5_6_27.php

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

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index aa3f4c1d8f9770ef47313c7d150354603f094cd3..69a93713d08d6570a8311bc479cb20fc460808e1 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -29,9 +29,9 @@
 +;  - the global prefix if it's been set (-p argument)
 +;  - @prefix@ otherwise
 +include=/etc/php/fpm.d/*.conf
---- php-5.6.2/sapi/fpm/php-fpm.conf-d.in       2014-10-27 08:15:35.350075839 +0200
-+++ php-5.6.2.old/sapi/fpm/php-fpm.conf-d.in   2014-10-27 08:07:47.762117299 +0200
-@@ -30,7 +32,7 @@
+--- 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.
  ; Note: This value is mandatory.
@@ -40,7 +40,20 @@
  
  ; Set listen(2) backlog.
  ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -51,7 +53,7 @@
+@@ -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
+-;listen.owner = @php_fpm_user@
+-;listen.group = @php_fpm_group@
+-;listen.mode = 0660
++listen.owner = root
++listen.group = @php_fpm_group@
++listen.mode = 0660
+ ; 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.
  ; Default Value: any
@@ -49,7 +62,7 @@
  
  ; Specify the nice(2) priority to apply to the pool processes (only if set)
  ; The value can vary from -19 (highest priority) to 20 (lower priority)
-@@ -370,7 +372,7 @@
+@@ -372,7 +372,7 @@
  ; the current environment.
  ; Default Value: clean env
  ;env[HOSTNAME] = $HOSTNAME