summaryrefslogtreecommitdiff
path: root/www/apache13-fp/files/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache13-fp/files/patch-ag')
-rw-r--r--www/apache13-fp/files/patch-ag38
1 files changed, 17 insertions, 21 deletions
diff --git a/www/apache13-fp/files/patch-ag b/www/apache13-fp/files/patch-ag
index d2122e7dbfca..f79b03c38932 100644
--- a/www/apache13-fp/files/patch-ag
+++ b/www/apache13-fp/files/patch-ag
@@ -1,6 +1,6 @@
---- 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 @@
+--- conf/httpd.conf-dist.orig Wed Feb 21 21:48:15 2001
++++ conf/httpd.conf-dist Wed Mar 7 23:43:56 2001
+@@ -95,6 +95,9 @@
#ResourceConfig conf/srm.conf
#AccessConfig conf/access.conf
@@ -10,7 +10,7 @@
#
# Timeout: The number of seconds before receives and sends time out.
#
-@@ -176,6 +179,10 @@
+@@ -174,6 +177,10 @@
#Listen 3000
#Listen 12.34.56.78:80
@@ -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
-@@ -278,7 +285,7 @@
+@@ -276,7 +283,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
-@@ -319,7 +326,16 @@
+@@ -317,7 +324,16 @@
# override. Can also be "All", or any combination of "Options", "FileInfo",
# "AuthConfig", and "Limit"
#
@@ -48,7 +48,7 @@
#
# Controls who can get stuff from this server.
-@@ -353,12 +369,36 @@
+@@ -351,12 +367,36 @@
# </LimitExcept>
#</Directory>
@@ -86,7 +86,7 @@
</IfModule>
#
-@@ -477,7 +517,7 @@
+@@ -475,7 +515,7 @@
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
@@ -95,7 +95,7 @@
#
# If you would like to have agent and referer logfiles, uncomment the
-@@ -490,7 +530,7 @@
+@@ -488,7 +528,7 @@
# If you prefer a single logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
@@ -104,7 +104,7 @@
#
# Optionally add a line containing the server version and virtual host
-@@ -729,13 +769,17 @@
+@@ -728,13 +768,17 @@
# For example, the PHP 3.x module (not part of the Apache distribution - see
# http://www.php.net) will typically use:
#
@@ -126,10 +126,10 @@
AddType application/x-tar .tgz
-@@ -854,6 +898,51 @@
- # Deny from all
- # Allow from .your_domain.com
- #</Location>
+@@ -944,3 +988,47 @@
+ # ErrorLog logs/dummy-host.example.com-error_log
+ # CustomLog logs/dummy-host.example.com-access_log common
+ #</VirtualHost>
+
+# This virtual Host allows access to the Apache & Frontpage Docs on port 8080
+<VirtualHost _default_:8080>
@@ -141,13 +141,13 @@
+
+ #
+ # This may also be "None", "All", or any combination of "Indexes",
-+ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
++ # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
+ #
+ # Note that "MultiViews" must be named *explicitly* --- "Options All"
-+ # doesn't give it to you.
++ # doesn't give it to you.
+ #
+ Options Indexes FollowSymLinks
-+
++
+ #
+ # This controls which options the .htaccess files in directories can
+ # override. Can also be "All", or any combination of "Options", "FileInfo",
@@ -174,7 +174,3 @@
+ ServerAdmin webmaster@@@HOSTNAME@@
+ ServerName @@HOSTNAME@@
+</VirtualHost>
-+
-
- #
- # Allow remote server configuration reports, with the URL of