Branch '2.3-stable' - apache/apache.spec apache/rc.apache

[Christoph Wickert]

 apache/apache.spec |    5 ++++-
 apache/rc.apache   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9a447c2d3a7d9c49c0504676dcc5bf7d1dcdac51
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Sep 28 19:03:46 2011 +0200

    apache: Make sure php-errors.log is rotated (kolab/issue4377)

diff --git a/apache/apache.spec b/apache/apache.spec
index 45baabb..2bb59be 100644
--- a/apache/apache.spec
+++ b/apache/apache.spec
@@ -32,7 +32,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      2.2.21
-Release:      20110917
+Release:      20110928
 
 #   package options
 %option       with_mpm_prefork          yes
@@ -347,6 +347,9 @@ AutoReqProv:  no
     exit 0
 
 %changelog
+* Wed Sep 28 2011 Christoph Wickert <wickert at kolabsys.com> - 2.2.21-20110928
+- Make sure php-errors.log is rotated (kolab/issue4377)
+
 * Sat Sep 17 2011 Christoph Wickert <wickert at kolabsys.com> - 2.2.21-20110917
 - Update to 2.2.21 (includes another fix for CVE-2011-3192)
 
diff --git a/apache/rc.apache b/apache/rc.apache
index cafd94d..b995079 100644
--- a/apache/rc.apache
+++ b/apache/rc.apache
@@ -17,7 +17,7 @@
     apache_err_rotcomplevel="9"
     apache_err_rotprolog="true"
     apache_err_rotepilog="true"
-    apache_php_err_files="@l_prefix@/var/apache/log/php-errors.log"
+    apache_php_err_files="@l_prefix@/var/apache/log/php/php-errors.log"
     apache_php_err_rotsteps="10"
     apache_php_err_rotminsize="1M"
     apache_php_err_rotcomplevel="9"