head	1.6;
access;
symbols
	old_RELEASE_4_2_0:1.5
	old_RELEASE_4_1_1:1.5
	old_RELEASE_4_1_0:1.5
	old_RELEASE_3_5_0:1.5
	old_RELEASE_4_0_0:1.5
	old_RELEASE_3_4_0:1.4
	old_RELEASE_3_3_0:1.4
	old_RELEASE_3_2_0:1.3
	old_RELEASE_3_1_0:1.3
	old_RELEASE_2_2_8:1.2
	old_RELEASE_3_0_0:1.2;
locks; strict;
comment	@# @;


1.6
date	2001.04.13.04.43.48;	author will;	state dead;
branches;
next	1.5;

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

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

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

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

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


desc
@@


1.6
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
@--- configure.orig	Tue Jan 18 01:53:17 2000
+++ configure	Mon Jan 24 19:37:21 2000
@@@@ -1232,8 +1232,8 @@@@
     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
@@@@ -1330,8 +1330,8 @@@@
 echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
 echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
 echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
 echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
 echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
 echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
@


1.5
log
@upgrade to 1.3.11
@
text
@@


1.4
log
@upgrade to 1.3.9
@
text
@d1 3
a3 12
--- configure.orig	Sat Aug 14 12:29:05 1999
+++ configure	Fri Sep  3 15:38:10 1999
@@@@ -1084,7 +1084,7 @@@@
 ##  UID/GID as production oriented as a web server in NIS anyway.
 ##
 conf_user="nobody"
-conf_group="#-1"
+conf_group="nogroup"
 conf_port="80"
 conf_serveradmin="you@@your.address"
 conf_servername="new.host.name"
@@@@ -1153,8 +1153,8 @@@@
d14 1
a14 1
@@@@ -1244,8 +1244,8 @@@@
@


1.3
log
@upgrade to 1.3.4
@
text
@d1 12
a12 3
--- configure.orig	Sat Jan  2 16:19:41 1999
+++ configure	Fri Jan 15 00:44:01 1999
@@@@ -1012,8 +1012,8 @@@@
d23 1
a23 1
@@@@ -1091,8 +1091,8 @@@@
@


1.2
log
@upgrade to 1.3.2
@
text
@d1 24
a24 40
*** configure.orig	Thu Sep 17 12:07:53 1998
--- configure	Thu Sep 24 03:57:33 1998
***************
*** 870,877 ****
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
!     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
!     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
      echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
--- 870,877 ----
      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
!     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
!     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
      echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
      echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
***************
*** 935,942 ****
  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
  echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
  echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
--- 935,942 ----
  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
  echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
  echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
@


1.1
log
@Upgrade to 1.3.1
@
text
@d1 2
a2 2
*** configure.bak	Sun Jul 12 13:25:46 1998
--- configure	Thu Jul 23 16:52:04 1998
d4 1
a4 1
*** 877,884 ****
d13 1
a13 1
--- 877,884 ----
d23 1
a23 1
*** 942,949 ****
d32 1
a32 1
--- 942,949 ----
@
