Upgrade to Apache 1.3.14

PR:		23104
Submitted by:	Scot W. Hetzel <hetzels@westbend.net> MAINTAINER

1 files changed, 58 insertions, 11 deletions

diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag
index 333ef6a30786..d2122e7dbfca 100644
--- a/www/apache13-fp/files/patch-ag
+++ b/www/apache13-fp/files/patch-ag
@@ -1,5 +1,5 @@
---- conf/httpd.conf-dist.orig	Wed May  5 15:17:59 1999
-+++ conf/httpd.conf-dist	Wed Oct 27 21:37:07 1999
+--- conf/httpd.conf-dist.orig	Thu Sep 28 08:12:36 2000
++++ conf/httpd.conf-dist	Sat Nov 25 11:40:39 2000
 @@ -97,6 +97,9 @@
  #ResourceConfig conf/srm.conf
  #AccessConfig conf/access.conf
@@ -21,7 +21,7 @@
  #
  # BindAddress: You can support virtual hosts with this option. This directive
  # is used to tell the server which IP address to listen to. It can either
-@@ -274,7 +281,7 @@
+@@ -278,7 +285,7 @@
  # documents. By default, all requests are taken from this directory, but
  # symbolic links and aliases may be used to point to other locations.
  #
@@ -30,7 +30,7 @@
  
  #
  # Each directory to which Apache has access, can be configured with respect
-@@ -315,7 +322,16 @@
+@@ -319,7 +326,16 @@
  # override. Can also be "All", or any combination of "Options", "FileInfo", 
  # "AuthConfig", and "Limit"
  #
@@ -48,8 +48,8 @@
  
  #
  # Controls who can get stuff from this server.
-@@ -347,6 +363,15 @@
- #    </Limit>
+@@ -353,12 +369,36 @@
+ #    </LimitExcept>
  #</Directory>
  
 +### In Order for FrontPage to work in User and Virtual ###
@@ -64,7 +64,29 @@
  #
  # DirectoryIndex: Name of the file or files to use as a pre-written HTML
  # directory index.  Separate multiple entries with spaces.
-@@ -467,7 +492,7 @@
+ #
+ <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>
+ 
+ #
+@@ -477,7 +517,7 @@
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
@@ -73,7 +95,7 @@
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
-@@ -480,7 +505,7 @@
+@@ -490,7 +530,7 @@
  # If you prefer a single logfile with access, agent, and referer information
  # (Combined Logfile Format) you can use the following directive.
  #
@@ -82,10 +104,32 @@
  
  #
  # Optionally add a line containing the server version and virtual host
-@@ -852,3 +877,48 @@
+@@ -729,13 +769,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>
  
- #<VirtualHost _default_:*>
- #</VirtualHost>
+     AddType application/x-tar .tgz
+ 
+@@ -854,6 +898,51 @@
+ #    Deny from all
+ #    Allow from .your_domain.com
+ #</Location>
 +
 +# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
 +<VirtualHost _default_:8080>
@@ -131,3 +175,6 @@
 +    ServerName @@HOSTNAME@@
 +</VirtualHost>
 +
+ 
+ #
+ # Allow remote server configuration reports, with the URL of