fielding 99/02/09 10:00:37
Modified: . STATUS
src CHANGES
src/support apachectl
Log:
Prevent apachectl from complaining if the PIDFILE exists but
does not contain a process id, as might occur if the server is
being rapidly restarted.
Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding, Jim Jagielski
Revision Changes Path
1.616 +1 -5 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- STATUS 1999/02/09 17:17:01 1.615
+++ STATUS 1999/02/09 18:00:18 1.616
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/02/09 17:17:01 $]
+ Last modified at [$Date: 1999/02/09 18:00:18 $]
Release:
@@ -65,10 +65,6 @@
Message-ID: <[EMAIL PROTECTED]>
Status: Roy [looks good, but we might be able to do better by using
the same function as Limit and just checking cmd]
-
- * Fred's Bug with graceful restarts? Ignore empty pid file
- Message-ID: <[EMAIL PROTECTED]>
- Status: Roy +1, Jim +1
* Dean's [PATCH] etag continued (take 2)
Adds strong comparison functions to other checks.
1.1244 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1243
retrieving revision 1.1244
diff -u -r1.1243 -r1.1244
--- CHANGES 1999/02/09 17:17:04 1.1243
+++ CHANGES 1999/02/09 18:00:22 1.1244
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) Prevent apachectl from complaining if the PIDFILE exists but
+ does not contain a process id, as might occur if the server is
+ being rapidly restarted. [Wilfredo Sanchez]
+
*) Win32: Add global symbols missing from ApacheCore.def. [Carl Olsen]
*) Entity tag comparisons for If-Match and If-None-Match were not being
1.13 +1 -1 apache-1.3/src/support/apachectl
Index: apachectl
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/apachectl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apachectl 1999/01/01 19:05:32 1.12
+++ apachectl 1999/02/09 18:00:34 1.13
@@ -50,7 +50,7 @@
# check for pidfile
if [ -f $PIDFILE ] ; then
PID=`cat $PIDFILE`
- if kill -0 $PID; then
+ if [ ! "x$PID" = "x" ] && kill -0 $PID; then
STATUS="httpd (pid $PID) running"
RUNNING=1
else
