freebsd-ports/www/apache22/files/patch-ab
Andrey A. Chernov 12c02eddd7 Upgrade to 1.1.1
OK-ed by: gpalmer
1996-07-11 11:04:01 +00:00

129 lines
4.2 KiB
Plaintext

*** conf/access.conf-dist.orig Wed Jul 3 21:18:11 1996
--- conf/access.conf-dist Fri Jul 5 06:32:54 1996
***************
*** 12,18 ****
# This should be changed to whatever you set DocumentRoot to.
! <Directory /usr/local/etc/httpd/htdocs>
# This may also be "None", "All", or any combination of "Indexes",
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
--- 12,18 ----
# This should be changed to whatever you set DocumentRoot to.
! <Directory /usr/local/www/data>
# This may also be "None", "All", or any combination of "Indexes",
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
***************
*** 38,44 ****
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
! <Directory /usr/local/etc/httpd/cgi-bin>
AllowOverride None
Options None
</Directory>
--- 38,44 ----
# /usr/local/etc/httpd/cgi-bin should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
! <Directory /usr/local/www/cgi-bin>
AllowOverride None
Options None
</Directory>
*** conf/httpd.conf-dist.orig Sat Jun 8 00:56:47 1996
--- conf/httpd.conf-dist Fri Jul 5 06:25:42 1996
***************
*** 33,44 ****
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
! ServerAdmin you@your.address
# ServerRoot: The directory the server's config, error, and log files
# are kept in
! ServerRoot /usr/local/etc/httpd
# BindAddress: You can support virtual hosts with this option. This option
# is used to tell the server which IP address to listen to. It can either
--- 33,44 ----
# ServerAdmin: Your address, where problems with the server should be
# e-mailed.
! ServerAdmin you@your.address.domain
# ServerRoot: The directory the server's config, error, and log files
# are kept in
! ServerRoot /usr/local/www/server
# BindAddress: You can support virtual hosts with this option. This option
# is used to tell the server which IP address to listen to. It can either
***************
*** 161,167 ****
#<VirtualHost host.foo.com>
#ServerAdmin webmaster@host.foo.com
! #DocumentRoot /www/docs/host.foo.com
#ServerName host.foo.com
#ErrorLog logs/host.foo.com-error_log
#TransferLog logs/host.foo.com-access_log
--- 161,167 ----
#<VirtualHost host.foo.com>
#ServerAdmin webmaster@host.foo.com
! #DocumentRoot /usr/local/www/host.foo.com/data
#ServerName host.foo.com
#ErrorLog logs/host.foo.com-error_log
#TransferLog logs/host.foo.com-access_log
*** conf/srm.conf-dist.orig Thu Jun 13 06:04:43 1996
--- conf/srm.conf-dist Fri Jul 5 06:37:24 1996
***************
*** 12,18 ****
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
! DocumentRoot /usr/local/etc/httpd/htdocs
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is recieved.
--- 12,18 ----
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
! DocumentRoot /usr/local/www/data
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is recieved.
***************
*** 131,142 ****
# Aliases: Add here as many aliases as you need (with no limit). The format is
# Alias fakename realname
! #Alias /icons/ /usr/local/etc/httpd/icons/
# ScriptAlias: This controls which directories contain server scripts.
# Format: ScriptAlias fakename realname
! #ScriptAlias /cgi-bin/ /usr/local/etc/httpd/cgi-bin/
# If you want to use server side includes, or CGI outside
# ScriptAliased directories, uncomment the following lines.
--- 131,142 ----
# Aliases: Add here as many aliases as you need (with no limit). The format is
# Alias fakename realname
! Alias /icons/ /usr/local/www/icons/
# ScriptAlias: This controls which directories contain server scripts.
# Format: ScriptAlias fakename realname
! ScriptAlias /cgi-bin/ /usr/local/www/cgi-bin/
# If you want to use server side includes, or CGI outside
# ScriptAliased directories, uncomment the following lines.