[Pkg-apache-commits] r1195 - in /trunk/apache2: apache2.2-common.apache2.init changelog

[sf at alioth.debian.org]

Author: sf
Date: Tue May 11 19:28:12 2010
New Revision: 1195

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1195
Log:
Fix init script not correctly killing htcacheclean. Closes: #580971

Modified:
    trunk/apache2/apache2.2-common.apache2.init
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.init?rev=1195&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Tue May 11 19:28:12 2010
@@ -98,7 +98,7 @@
 }
 
 stop_htcacheclean() {
-	pkill -P 1 -f "htcacheclean.*\\<-p$HTCACHECLEAN_PATH\\>" 2> /dev/null || echo ...not running
+	pkill -P 1 -f "htcacheclean.* -p$HTCACHECLEAN_PATH " 2> /dev/null || echo ...not running
 }
 
 pidof_apache() {

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1195&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue May 11 19:28:12 2010
@@ -1,3 +1,9 @@
+apache2 (2.2.15-6) UNRELEASED; urgency=low
+
+  * Fix init script not correctly killing htcacheclean. Closes: #580971
+
+ -- Stefan Fritsch <sf at debian.org>  Tue, 11 May 2010 21:22:48 +0200
+
 apache2 (2.2.15-5) unstable; urgency=low
 
   * Conflict with apache package as we now include apachectl. Closes: #579065