head	1.9;
access;
symbols
	old_RELEASE_4_2_0:1.8
	old_RELEASE_4_1_1:1.8
	old_RELEASE_4_1_0:1.8
	old_RELEASE_3_5_0:1.8
	old_RELEASE_4_0_0:1.8
	old_RELEASE_3_4_0:1.8
	old_RELEASE_3_3_0:1.8
	old_RELEASE_3_2_0:1.7
	old_RELEASE_3_1_0:1.6
	old_RELEASE_2_2_8:1.6
	old_RELEASE_3_0_0:1.6
	old_RELEASE_2_2_7:1.4
	old_RELEASE_2_2_6:1.3;
locks; strict;
comment	@# @;


1.9
date	2001.04.13.04.43.48;	author will;	state dead;
branches;
next	1.8;

1.8
date	99.09.03.16.07.52;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	99.03.25.22.25.56;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	98.07.23.20.38.33;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	98.07.23.13.16.06;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	98.04.21.21.58.10;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	97.11.21.21.19.04;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	97.11.21.21.10.27;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	97.10.22.23.51.34;	author ache;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Bring in Apache 2.0.16-beta.  Just in time for the release...

PR:		26410
Submitted by:	Chang, Hye-Shik <perky@@python.or.kr>
Repocopied by:	asami
@
text
@--- src/support/apachectl.orig	Wed Apr  7 00:36:33 1999
+++ src/support/apachectl	Fri Sep  3 15:41:01 1999
@@@@ -39,6 +39,8 @@@@
 # --------------------                              --------------------
 # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
 
+eval `limits -e -C daemon` >/dev/null 2>&1
+
 ERROR=0
 ARGV="$@@"
 if [ "x$ARGV" = "x" ] ; then 
@@@@ -82,6 +84,7 @@@@
 	fi
 	if kill $PID ; then
 	    echo "$0 $ARG: httpd stopped"
+	    rm $PIDFILE
 	else
 	    echo "$0 $ARG: httpd could not be stopped"
 	    ERROR=4
@


1.8
log
@upgrade to 1.3.9
@
text
@@


1.7
log
@upgrade to 1.3.6
@
text
@d1 2
a2 2
--- src/support/apachectl.orig	Tue Feb  9 21:00:34 1999
+++ src/support/apachectl	Fri Mar 26 00:08:20 1999
a11 9
@@@@ -50,7 +52,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 > /dev/null 2>&1; then
 	    STATUS="httpd (pid $PID) running"
 	    RUNNING=1
 	else
@


1.6
log
@apachectl: redirect kill output to /dev/null
@
text
@d1 28
a28 40
*** src/support/apachectl.orig	Fri Jul 17 01:25:54 1998
--- src/support/apachectl	Fri Jul 24 00:34:59 1998
***************
*** 39,44 ****
--- 39,46 ----
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  
+ eval `limits -e -C daemon` >/dev/null 2>&1
+ 
  ERROR=0
  ARGV="$@@"
  if [ "x$ARGV" = "x" ] ; then 
***************
*** 50,56 ****
      # check for pidfile
      if [ -f $PIDFILE ] ; then
  	PID=`cat $PIDFILE`
! 	if kill -0 $PID; then
  	    STATUS="httpd (pid $PID) running"
  	    RUNNING=1
  	else
--- 52,58 ----
      # check for pidfile
      if [ -f $PIDFILE ] ; then
  	PID=`cat $PIDFILE`
! 	if kill -0 $PID > /dev/null 2>&1; then
  	    STATUS="httpd (pid $PID) running"
  	    RUNNING=1
  	else
***************
*** 82,87 ****
--- 84,90 ----
  	fi
  	if kill $PID ; then
  	    echo "$0 $ARG: httpd stopped"
+ 	    rm $PIDFILE
  	else
  	    echo "$0 $ARG: httpd could not be stopped"
  	    ERROR=4
@


1.5
log
@Upgrade to 1.3.1
@
text
@d2 1
a2 1
--- src/support/apachectl	Thu Jul 23 17:11:38 1998
d14 17
@


1.4
log
@Upgrade to 1.3b6, now with loadable modules!
@
text
@d1 2
a2 2
*** src/support/apachectl.orig	Tue Mar 31 16:53:46 1998
--- src/support/apachectl	Tue Apr 21 17:15:55 1998
d4 2
a5 3
*** 37,42 ****
--- 37,44 ----
  #
d8 2
a10 2
+ eval `limits -e -C daemon` >/dev/null 2>&1
  
d13 11
@


1.3
log
@Redirect ulimit output to /dec/null
@
text
@d1 2
a2 25
*** src/support/apachectl.orig	Sun Oct 26 02:35:19 1997
--- src/support/apachectl	Fri Nov 21 22:58:08 1997
***************
*** 21,30 ****
  # --------------------                              --------------------
  # 
  # 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
  #
  # a command that outputs a formatted text version of the HTML at the
  # url given on the command line.  Designed for lynx, however other
--- 21,30 ----
  # --------------------                              --------------------
  # 
  # the path to your PID file
! PIDFILE=/var/run/httpd.pid
  #
  # the path to your httpd binary
! HTTPD=/usr/local/sbin/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
@


1.2
log
@Upgrade to 1.3b3
@
text
@d33 1
a33 1
+ eval `limits -e -C daemon`
@


1.1
log
@Upgrade to 1.3b2, now with support files and docs installed
@
text
@d1 2
a2 2
*** src/support/apachectl.orig	Thu Oct 16 22:58:26 1997
--- src/support/apachectl	Thu Oct 23 03:35:09 1997
d8 1
a8 1
! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
d11 1
a11 1
! HTTPD=/usr/local/etc/httpd/src/httpd
d27 2
a28 16
*** 33,42 ****
  #
  # the URL to your server's mod_status status page.  If you do not
  # have one, then status and fullstatus will not work.
! STATUSURL="http://localhost/server-status"
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
  
  ERROR=0
  ARGV="$@@"
--- 33,44 ----
  #
  # the URL to your server's mod_status status page.  If you do not
  # have one, then status and fullstatus will not work.
! STATUSURL="http://localhost/status"
@
