From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Fri, 12 Apr 2002 01:08:40 +0000 (+0000)
Subject: Change httpd.pid placement to rel_runtimedir instead of rel_logfiledir.
X-Git-Tag: 2.0.36~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da91ebd816bd7e5d2617f601b9b025bee78eaaf3;p=thirdparty%2Fapache%2Fhttpd.git

Change httpd.pid placement to rel_runtimedir instead of rel_logfiledir.
With the standard apache layout, this changes nothing (since runtimedir ==
logfiledir), but for other layouts, this makes a lot more sense.

PR: 7841
Submitted by:   Andreas Hasenack <andreas@netbank.com.br>
Reviewed by:    Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94606 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index f3ca2bd7d2f..f88893654af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.36
+  
+  *) Fix PidFile to default to rel_runtimedir instead of
+     rel_logfiledir.  PR 7841.  [Andreas Hasenack <andreas@netbank.com.br>]
+
   *) Win32: Fix problem that caused rapid performance degradation
      when number of connecting clients exceeded ThreadsPerChild.
      [Bill Stoddard]
diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index b015f27a8fd..d59810c298c 100644
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -78,7 +78,7 @@ ServerRoot "@@ServerRoot@@"
 # identification number when it starts.
 #
 <IfModule !mpm_netware.c>
-PidFile @rel_logfiledir@/httpd.pid
+PidFile @rel_runtimedir@/httpd.pid
 </IfModule>
 
 #