upstream patch to fix build with icu >= 70

[packages/php.git] / fpm-conf-split.patch

diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 3d4bd92a238d65fc4d263c9e1e3f1014df9b1005..4e36a925214e8c45f6da9594c95e2cbb042788c6 100644 (file)
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -15,11 +15,10 @@
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
  ;;;;;;;;;;;;;;;;;;
-@@ -115,415 +115,3 @@
- ; ports and different management options.  The name of the pool will be
+@@ -116,420 +116,3 @@
  ; used in logs and stats. There is no limitation on the number of pools which
  ; FPM can handle. Your system will tell you anyway :)
--
+ 
 -; Start a new pool named 'www'.
 -; the variable $pool can we used in any directive and will be replaced by the
 -; pool name ('www' here)
@@ -93,6 +92,12 @@
 -; Default Value: no set
 -; process.priority = -19
 -
+-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+-; or group is differrent than the master process user. It allows to create process
+-; core dump and ptrace the process for the pool user.
+-; Default Value: no
+-; process.dumpable = yes
+-
 -; Choose how the process manager will control the number of child processes.
 -; Possible Values:
 -;   static  - a fixed number (pm.max_children) of child processes;
@@ -433,7 +438,7 @@
 -;php_admin_value[memory_limit] = 32M
 --- /dev/null  2007-02-13 18:29:53.000000000 +0200
 +++ php-5.6.5/sapi/fpm/php-fpm.conf-d.in       2015-02-04 19:23:20.709225773 +0200
-@@ -0,0 +1,411 @@
+@@ -0,0 +1,417 @@
 +; Start a new pool named 'www'.
 +; the variable $pool can we used in any directive and will be replaced by the
 +; pool name ('www' here)
@@ -507,6 +512,12 @@
 +; Default Value: no set
 +; process.priority = -19
 +
++; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
++; or group is differrent than the master process user. It allows to create process
++; core dump and ptrace the process for the pool user.
++; Default Value: no
++; process.dumpable = yes
++
 +; Choose how the process manager will control the number of child processes.
 +; Possible Values:
 +;   static  - a fixed number (pm.max_children) of child processes;