cvs commit: apache-1.3/src/support apachectl
jim 99/04/06 13:36:33 Modified:src/support apachectl Log: Minor nit. Possible portability concern, since we don't use this format anyplace else AFAIK Revision ChangesPath 1.15 +1 -1 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- apachectl 1999/04/06 20:34:56 1.14 +++ apachectl 1999/04/06 20:36:33 1.15 @@ -50,7 +50,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - if [ ! "x$PID" = "x" ] && kill -0 $PID 2>/dev/null ; then + if [ "x$PID" != "x" ] && kill -0 $PID 2>/dev/null ; then STATUS="httpd (pid $PID) running" RUNNING=1 else
cvs commit: apache-1.3/src/support apachectl
jim 99/04/06 13:34:57 Modified:src/support apachectl Log: Avoid the confusing error message from kill if the PID isn't valid. We take care of this ourselves Revision ChangesPath 1.14 +1 -1 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- apachectl 1999/02/09 18:00:34 1.13 +++ apachectl 1999/04/06 20:34:56 1.14 @@ -50,7 +50,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - if [ ! "x$PID" = "x" ] && kill -0 $PID; then + if [ ! "x$PID" = "x" ] && kill -0 $PID 2>/dev/null ; then STATUS="httpd (pid $PID) running" RUNNING=1 else
cvs commit: apache-1.3/src/support apachectl
fielding99/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 ChangesPath 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 --- STATUS1999/02/09 17:17:01 1.615 +++ STATUS1999/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
cvs commit: apache-1.3/src/support apachectl
martin 98/09/14 09:04:19 Modified:src/support apachectl Log: Undo the redirection of kill -0 to /dev/null. It CAN hide real problems Revision ChangesPath 1.11 +1 -1 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apachectl 1998/09/08 21:07:13 1.10 +++ apachectl 1998/09/14 16:04:18 1.11 @@ -50,7 +50,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - if kill -0 $PID 2>/dev/null; then + if kill -0 $PID; then STATUS="httpd (pid $PID) running" RUNNING=1 else
cvs commit: apache-1.3/src/support apachectl
martin 98/09/08 14:07:14 Modified:src/support apachectl Log: Suppress errors of 'kill -0' when no server is running Revision ChangesPath 1.10 +1 -1 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apachectl 1998/07/16 21:25:54 1.9 +++ apachectl 1998/09/08 21:07:13 1.10 @@ -50,7 +50,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - if kill -0 $PID; then + if kill -0 $PID 2>/dev/null; then STATUS="httpd (pid $PID) running" RUNNING=1 else
cvs commit: apache-1.3/src/support apachectl
lars98/07/16 14:25:55
Modified:src/support apachectl
Log:
Fix 'status' output.
Solaris' awk sucks. I think this is a more portable solution.
(tested under Solaris, SunOS, Digital Unix and Linux)
PR: 2613
Revision ChangesPath
1.9 +1 -1 apache-1.3/src/support/apachectl
Index: apachectl
===
RCS file: /home/cvs/apache-1.3/src/support/apachectl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apachectl 1998/06/25 19:14:44 1.8
+++ apachectl 1998/07/16 21:25:54 1.9
@@ -136,7 +136,7 @@
fi
;;
status)
- $LYNX $STATUSURL | awk ' { if (/current process/) { print; exit } else
print } '
+ $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
;;
fullstatus)
$LYNX $STATUSURL
cvs commit: apache-1.3/src/support apachectl
dgaudet 98/06/25 12:14:47 Modified:src CHANGES src/support apachectl Log: use kill -0 $PID Revision ChangesPath 1.931 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.930 retrieving revision 1.931 diff -u -r1.930 -r1.931 --- CHANGES 1998/06/23 23:41:11 1.930 +++ CHANGES 1998/06/25 19:14:40 1.931 @@ -1,5 +1,10 @@ Changes with Apache 1.3.1 + *) PORT: Change support/apachectl to use "kill -0 $pid" to test if the + httpd is running. This should be more portable than figuring out + which of three dozen different versions of "ps" are installed. + [a cast of dozens] + *) Win32: If we can't figure out how to execute a file in a script directory, bail out of the request with an error message. [W G Stoddard] 1.8 +4 -5 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apachectl 1998/06/10 12:08:51 1.7 +++ apachectl 1998/06/25 19:14:44 1.8 @@ -50,13 +50,12 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - PS=`ps -p $PID 2>/dev/null | tail -1 | grep $PID` - if [ "x$PS" = "x" ]; then - STATUS="httpd (pid $PID?) not running" - RUNNING=0 - else + if kill -0 $PID; then STATUS="httpd (pid $PID) running" RUNNING=1 + else + STATUS="httpd (pid $PID?) not running" + RUNNING=0 fi else STATUS="httpd (no pid file) not running"
cvs commit: apache-1.3/src/support apachectl.1 httpd.8
rse 98/03/16 07:58:53
Modified:src/main http_main.c
src/support apachectl.1 httpd.8
Log:
Even more cleanups for command line interface
and corresponding manual pages
Revision ChangesPath
1.305 +4 -0 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- http_main.c 1998/03/16 12:09:54 1.304
+++ http_main.c 1998/03/16 15:58:48 1.305
@@ -3873,7 +3873,11 @@
setup_prelinked_modules();
+#ifdef DEBUG_SIGSTOP
while ((c = getopt(argc, argv, "C:c:Xd:f:vVhlZ:")) != -1) {
+#else
+while ((c = getopt(argc, argv, "C:c:Xd:f:vVhl")) != -1) {
+#endif
char **new;
switch (c) {
case 'c':
1.3 +4 -4 apache-1.3/src/support/apachectl.1
Index: apachectl.1
===
RCS file: /export/home/cvs/apache-1.3/src/support/apachectl.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apachectl.1 1998/01/07 16:47:10 1.2
+++ apachectl.1 1998/03/16 15:58:52 1.3
@@ -51,13 +51,13 @@
apachectl \- Apache HTTP server control interface
.SH SYNOPSIS
.B apachectl
-command [...]
+\fIcommand\fP [...]
.SH DESCRIPTION
.B apachectl
is a front end to the Apache HyperText Transfer Protocol (HTTP)
server. It is designed to help the administrator control the
functioning of the Apache
-.B httpd(8)
+.B httpd
daemon.
.PP
.B NOTE:
@@ -77,7 +77,7 @@
.B http://www.apache.org/
.
.SH OPTIONS
-The command can be any one or more of the following options:
+The \fIcommand\fP can be any one or more of the following options:
.TP 12
.BI start
Start the Apache daemon. Gives an error if it is already running.
@@ -93,7 +93,7 @@
Displays a full status report from
.B mod_status.
For this to work, you need to have mod_status enabled on your server
-and a text-based browser such as lynx available on your system. The
+and a text-based browser such as \fIlynx\fP available on your system. The
URL used to access the status report can be set by editing the
.B STATUSURL
variable in the script.
1.5 +47 -5 apache-1.3/src/support/httpd.8
Index: httpd.8
===
RCS file: /export/home/cvs/apache-1.3/src/support/httpd.8,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httpd.8 1998/01/07 16:47:13 1.4
+++ httpd.8 1998/03/16 15:58:52 1.5
@@ -54,12 +54,34 @@
.SH SYNOPSIS
.B httpd
[
-.B \-hlvX?
+.B \-X
] [
.BI \-d " serverroot"
] [
.BI \-f " config"
+] [
+.BI \-C " directive"
+] [
+.BI \-c " directive"
]
+
+.B httpd
+[
+.B \-h
+]
+[
+.B \-l
+]
+[
+.B \-v
+]
+[
+.B \-V
+]
+[
+.B \-?
+]
+
.SH DESCRIPTION
.B httpd
is the Apache HyperText Transfer Protocol (HTTP) server program. It is
@@ -73,10 +95,13 @@
time a connection to the HTTP service is made.
.PP
This manual page only lists the command line arguments. For details
-of the directives necessary to configure httpd see the Apache manual,
+of the directives necessary to configure
+.B httpd
+see the Apache manual,
which is part of the Apache distribution or can be found at
http://www.apache.org/. Paths in this manual may not reflect those
-compiled into httpd.
+compiled into
+.B httpd.
.SH OPTIONS
.TP 12
.BI \-d " serverroot"
@@ -89,6 +114,12 @@
does not begin with a /, then it is taken to be a path relative to
the ServerRoot. The default is \fBconf/httpd.conf\fP.
.TP
+.BI \-C " directive"
+Process the configuration \fIdirective\fP before reading config files.
+.TP
+.BI \-c " directive"
+Process the configuration \fIdirective\fP after reading config files.
+.TP
.B \-h
Output a list of directives together with expected arguments and
places where the directive is valid.
@@ -102,10 +133,19 @@
to provide ordinary web service.
.TP
.B \-v
-Print the version of httpd, and then exit.
+Print the version of
+.B httpd
+, and then exit.
+.TP
+.B \-V
+Print the version and build parameters of
+.B httpd
+, and then exit.
.TP
.B \-?
-Print a list of the httpd options, and then exit.
+Print a list of the
+.B httpd
+options, and then exit.
.SH FILES
.PD 0
.B /usr/local/apache/conf/httpd.conf
@@ -115,6 +155,8 @@
.B /usr/local/apache/conf/access.conf
.br
.B /usr/local/apache/conf/mime.types
+.br
+.B /usr/local/apache/conf/magic
.br
.B /usr/local/apache/logs/error_log
.br
cvs commit: apache-1.3/src/support apachectl
dgaudet 98/02/14 02:55:54 Modified:src/support apachectl Log: I used this for the first time... and found it emits error messages (at least on linux) while doing "apachectl start". Revision ChangesPath 1.5 +3 -3 apache-1.3/src/support/apachectl Index: apachectl === RCS file: /export/home/cvs/apache-1.3/src/support/apachectl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apachectl 1998/01/07 16:47:10 1.4 +++ apachectl 1998/02/14 10:55:53 1.5 @@ -23,8 +23,8 @@ # the path to your PID file PIDFILE=/usr/local/apache/logs/httpd.pid # -# the path to your httpd binary -HTTPD=/usr/local/apache/src/httpd +# the path to your httpd binary, including options if necessary +HTTPD='/usr/local/apache/src/httpd' # # a command that outputs a formatted text version of the HTML at the # url given on the command line. Designed for lynx, however other @@ -49,7 +49,7 @@ # check for pidfile if [ -f $PIDFILE ] ; then PID=`cat $PIDFILE` - PS=`ps -p $PID | tail -1 | grep $PID` + PS=`ps -p $PID 2>/dev/null | tail -1 | grep $PID` if [ "x$PS" = "x" ]; then STATUS="httpd (pid $PID?) not running" RUNNING=0
