[packages/php] - fpm: catch_workers_output=yes in default config

glen glen at pld-linux.org
Thu Jul 12 14:44:14 CEST 2012


commit 80f70dbad60970b7f72d3196f2ef90b4e95dbf84
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jul 12 15:43:23 2012 +0300

    - 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

 php-fpm-config.patch | 9 +++++++++
 php.spec             | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 9abc6e6..a2068e9 100644
--- 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 f526cc7..b770a82 100644
--- 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


More information about the pld-cvs-commit mailing list