- fpm: catch_workers_output=yes in default config

otherwise all php error_log is discarded
see also https://bugs.php.net/bug.php?id=61045

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 9abc6e658409c7e2f32c7a16fabfdfe56f1a9498..a2068e9f04e7d018ad2e7c35a613fa557c11ecb7 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -51,6 +51,15 @@
   
  ; The ping URI to call the monitoring page of FPM. If this value is not set, no
  ; URI will be recognized as a ping page. This could be used to test from outside
+@@ -449,7 +449,7 @@
+ ; Note: on highloaded environement, this can cause some delay in the page
+ ; process time (several ms).
+ ; Default Value: no
+-;catch_workers_output = yes
++catch_workers_output = yes
+ 
+ ; Limits the extensions of the main script FPM will allow to parse. This can
+ ; prevent configuration mistakes on the web server side. You should only limit
 @@ -463,7 +463,7 @@
  ; the current environment.
  ; Default Value: clean env

diff --git a/php.spec b/php.spec
index f526cc754f849fe1e8248aacdcf5c235e4ed8a06..b770a82b8c6f2a781091c4e8901c9c49988d7342 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -110,7 +110,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     1
+%define                rel     2
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP