head	1.8;
access;
symbols
	RELEASE_9_0_0:1.7
	RELEASE_7_4_0:1.7
	RELEASE_8_2_0:1.7
	RELEASE_6_EOL:1.7
	RELEASE_8_1_0:1.7
	RELEASE_7_3_0:1.7
	RELEASE_8_0_0:1.7
	RELEASE_7_2_0:1.7
	RELEASE_7_1_0:1.7
	RELEASE_6_4_0:1.7
	RELEASE_5_EOL:1.7
	RELEASE_7_0_0:1.7
	RELEASE_6_3_0:1.7
	PRE_XORG_7:1.7
	RELEASE_4_EOL:1.7
	RELEASE_6_2_0:1.7
	RELEASE_6_1_0:1.7
	RELEASE_5_5_0:1.7
	RELEASE_6_0_0:1.7
	RELEASE_5_4_0:1.7
	RELEASE_4_11_0:1.7
	RELEASE_5_3_0:1.7
	RELEASE_4_10_0:1.7
	RELEASE_5_2_1:1.7
	RELEASE_5_2_0:1.7
	RELEASE_4_9_0:1.7
	RELEASE_5_1_0:1.7
	RELEASE_4_8_0:1.7
	RELEASE_5_0_0:1.7
	RELEASE_4_7_0:1.7
	RELEASE_4_6_2:1.7
	RELEASE_4_6_1:1.7
	RELEASE_4_6_0:1.7
	RELEASE_5_0_DP1:1.7
	RELEASE_4_5_0:1.6
	RELEASE_4_4_0:1.4
	RELEASE_4_3_0:1.4
	RELEASE_4_2_0:1.4
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	RELEASE_3_4_0:1.3
	RELEASE_3_3_0:1.3
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.2
	RELEASE_2_2_8:1.1.1.1
	RELEASE_3_0_0:1.1.1.1
	mod_ssl_2_0_5:1.1.1.1
	RSE:1.1.1;
locks; strict;
comment	@# @;


1.8
date	2012.01.01.19.30.37;	author ohauer;	state dead;
branches;
next	1.7;

1.7
date	2002.02.08.05.05.37;	author pat;	state Exp;
branches;
next	1.6;

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

1.5
date	2001.10.22.15.38.49;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2000.11.15.16.10.38;	author ade;	state Exp;
branches;
next	1.3;

1.3
date	99.03.24.09.54.13;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	99.01.13.08.03.06;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	98.08.27.16.00.05;	author rse;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	98.08.27.16.00.05;	author rse;	state Exp;
branches;
next	;


desc
@@


1.8
log
@- remove apache13 and ports depending on apache13 from portstree
  ( EXPIRATION_DATE=2012-01-01 )

with hat apache@@
@
text
@--- conf/httpd.conf-dist.orig	Thu Feb  7 23:50:37 2002
+++ conf/httpd.conf-dist	Thu Feb  7 23:50:38 2002
@@@@ -92,8 +92,8 @@@@
 # server ignore these files altogether by using "/dev/null" (for Unix) or
 # "nul" (for Win32) for the arguments to the directives.
 #
-#ResourceConfig conf/srm.conf
-#AccessConfig conf/access.conf
+ResourceConfig /dev/null
+AccessConfig   /dev/null
 
 #
 # Timeout: The number of seconds before receives and sends time out.
@@@@ -367,7 +367,22 @@@@
 # directory index.  Separate multiple entries with spaces.
 #
 <IfModule mod_dir.c>
-    DirectoryIndex index.html
+    <IfModule mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.php3 index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.php3 index.html
+        </IfModule>
+    </IfModule>
+    <IfModule !mod_php3.c>
+        <IfModule mod_php4.c>
+            DirectoryIndex index.php index.html
+        </IfModule>
+        <IfModule !mod_php4.c>
+            DirectoryIndex index.html
+        </IfModule>
+    </IfModule>
 </IfModule>
 
 #
@@@@ -487,7 +502,7 @@@@
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog logs/access_log common
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@@@ -500,7 +515,7 @@@@
 # If you prefer a single logfile with access, agent, and referer information
 # (Combined Logfile Format) you can use the following directive.
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@


1.7
log
@Update to 1.3.23+2.8.6
@
text
@@


1.6
log
@Sync with main Apache port
@
text
@d1 2
a2 2
--- conf/httpd.conf-dist.orig	Thu Oct 18 13:57:36 2001
+++ conf/httpd.conf-dist	Thu Oct 18 13:58:20 2001
a55 22
@@@@ -779,13 +794,17 @@@@
     # For example, the PHP 3.x module (not part of the Apache distribution - see
     # http://www.php.net) will typically use:
     #
-    #AddType application/x-httpd-php3 .php3
-    #AddType application/x-httpd-php3-source .phps
+    <IfModule mod_php3.c>
+        AddType application/x-httpd-php3 .php3
+        AddType application/x-httpd-php3-source .php3s
+    </IfModule>
     #
     # And for PHP 4.x, use:
     #
-    #AddType application/x-httpd-php .php
-    #AddType application/x-httpd-php-source .phps
+    <IfModule mod_php4.c>
+        AddType application/x-httpd-php .php
+        AddType application/x-httpd-php-source .phps
+    </IfModule>
 
     AddType application/x-tar .tgz
 
@


1.5
log
@Upgrade to Apache 1.3.22 + mod_ssl 2.8.5

Submitted by: Masahiro TAKEMURA <mastake@@msel.t.u-tokyo.ac.jp>
@
text
@a13 9
@@@@ -255,7 +255,7 @@@@
 #  don't use Group "#-1" on these systems!
 #
 User nobody
-Group "#-1"
+Group nobody
 
 #
 # ServerAdmin: Your address, where problems with the server should be
@


1.4
log
@Gently persuade apache13-modssl to install in the same filesystem
space as www/apache13 does, so that other apache-dependendent ports
DTRT regardless of which one is installed.

Nothing concrete (other than we're working on a real cleanup of the
apache ports) has been heard from any of the maintainers.  Obviously
that is the best solution, but with 4.2-RELEASE just around the
corner, we have an opportunity here to at least remove a few bogons.

Both times I've raised this issue on -ports, however, there has been
significant interest in the patches, and now plenty of confirmations
that the modifications do not break the port in other ways.
@
text
@d1 4
a4 4
--- conf/httpd.conf-dist.orig	Wed Mar 24 10:30:16 1999
+++ conf/httpd.conf-dist	Wed Mar 24 10:33:06 1999
@@@@ -94,8 +94,8 @@@@
 # these files altogether by using "/dev/null" (for Unix) or
d14 2
a15 2
@@@@ -251,7 +251,7 @@@@
 #  don't use Group #-1 on these systems!
d18 1
a18 1
-Group #-1
d23 1
a23 1
@@@@ -354,7 +354,22 @@@@
d47 1
a47 1
@@@@ -469,7 +469,7 @@@@
d56 1
a56 1
@@@@ -482,7 +482,7 @@@@
d65 1
a65 1
@@@@ -708,13 +723,17 @@@@
@


1.3
log
@- Upgraded to Apache 1.3.6 + mod_ssl 2.2.6
- Cleaned up the port
@
text
@d23 24
d65 22
@


1.2
log
@- Upgrade to Apache 1.3.4
- Upgrade to mod_ssl 2.1.7
- Add additional master site
- Add Y2K link
- Make portlint happy
@
text
@d1 40
a40 53
*** conf/httpd.conf-dist.orig	Tue Jan 12 13:51:58 1999
--- conf/httpd.conf-dist	Tue Jan 12 13:52:37 1999
***************
*** 252,258 ****
  #  don't use Group #-1 on these systems!
  #
  User nobody
! Group #-1
  
  #
  # ServerAdmin: Your address, where problems with the server should be
--- 252,258 ----
  #  don't use Group #-1 on these systems!
  #
  User nobody
! Group nobody
  
  #
  # ServerAdmin: Your address, where problems with the server should be
***************
*** 470,476 ****
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
! CustomLog logs/access_log common
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
--- 470,476 ----
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
! #CustomLog logs/access_log common
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
***************
*** 483,489 ****
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
! #CustomLog logs/access_log combined
  
  #
  # Optionally add a line containing the server version and virtual host
--- 483,489 ----
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
! CustomLog logs/access_log combined
  
  #
  # Optionally add a line containing the server version and virtual host
@


1.1
log
@Initial revision
@
text
@d1 2
a2 2
*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
--- conf/httpd.conf-dist	Fri Jun  5 19:34:17 1998
d4 1
a4 1
*** 50,56 ****
d6 1
a6 1
  
d10 1
d12 1
a12 2
  # e-mailed.
--- 50,56 ----
d14 1
a14 1
  
d16 1
a16 1
! Group nogroup
d18 1
a19 1
  # e-mailed.
d21 4
a24 4
*** 94,100 ****
  # The location of the access logfile (Common Logfile Format).
  # If this does not start with /, ServerRoot is prepended to it.
  
d27 6
a32 6
  # If you would like to have an agent and referer logfile uncomment the
  # following directives.
--- 94,100 ----
  # The location of the access logfile (Common Logfile Format).
  # If this does not start with /, ServerRoot is prepended to it.
  
d35 2
a36 2
  # If you would like to have an agent and referer logfile uncomment the
  # following directives.
d38 2
a39 2
*** 105,111 ****
  # If you prefer a single logfile with access, agent and referer information
d41 1
a41 1
  
d44 4
a47 4
  # PidFile: The file the server should log its pid to
  PidFile logs/httpd.pid
--- 105,111 ----
  # If you prefer a single logfile with access, agent and referer information
d49 1
a49 1
  
d52 2
a53 2
  # PidFile: The file the server should log its pid to
  PidFile logs/httpd.pid
@


1.1.1.1
log
@Import of a new SSL-aware Apache 1.3, achieved by patching up
the original Apache 1.3.1 with mod_ssl 2.0.5 (the Apache
Interface to SSLeay).
@
text
@@
