You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/04/04 20:26:54 UTC
svn commit: r160073 -
httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
Author: slive
Date: Mon Apr 4 11:26:53 2005
New Revision: 160073
URL: http://svn.apache.org/viewcvs?view=rev&rev=160073
Log:
1. Change <Files ~> to <FilesMatch>.
2. Remove references to agent and referer logs. (The examples
are still in the docs.)
3. Clean up the description of Alias and Redirect, and bring them to
the same place in the config.
Modified:
httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
Modified: httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in?view=diff&r1=160072&r2=160073
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in Mon Apr 4 11:26:53 2005
@@ -203,10 +203,10 @@
# The following lines prevent .htaccess and .htpasswd files from being
# viewed by Web clients.
#
-<Files ~ "^\.ht">
+<FilesMatch "^\.ht">
Order allow,deny
Deny from all
-</Files>
+</FilesMatch>
<IfModule mime_module>
#
@@ -279,8 +279,6 @@
#
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
- LogFormat "%{Referer}i -> %U" referer
- LogFormat "%{User-agent}i" agent
<IfModule logio_module>
# You need to enable mod_logio.c to use %I and %O
@@ -297,30 +295,28 @@
CustomLog @rel_logfiledir@/access_log common
#
- # If you would like to have agent and referer logfiles, uncomment the
- # following directives.
- #
- #CustomLog @rel_logfiledir@/referer_log referer
- #CustomLog @rel_logfiledir@/agent_log agent
-
- #
- # If you prefer a single logfile with access, agent, and referer information
+ # If you prefer a logfile with access, agent, and referer information
# (Combined Logfile Format) you can use the following directive.
#
#CustomLog @rel_logfiledir@/access_log combined
</IfModule>
<IfModule alias_module>
- #
- # Aliases: Add here as many aliases as you need (with no limit). The format is
- # Alias fakename realname
- #
- # Note that if you include a trailing / on fakename then the server will
- # require it to be present in the URL. So "/icons" isn't aliased in this
- # example, only "/icons/". If the fakename is slash-terminated, then the
- # realname must also be slash terminated, and if the fakename omits the
- # trailing slash, the realname must also omit it.
- #
+ # Redirect allows you to tell clients about documents that used to
+ # exist in your server's namespace, but do not anymore. The client
+ # will make a new request for the document at its new location.
+ # Example:
+ # Redirect permanent /foo http://www.example.com/bar
+
+ # Aliases map web paths into filesystem paths and are used to
+ # access content that does not live under the DocumentRoot.
+ # Example:
+ # Alias /webpath /full/filesystem/path
+ #
+ # If you include a trailing / on /webpath then the server will
+ # require it to be present in the URL. You will also likely
+ # need to provide a <Directory> section to allow access to
+ # the filesystem path.
#
# This should be changed to the ServerRoot/manual/. The alias provides
@@ -378,14 +374,6 @@
Order allow,deny
Allow from all
</Directory>
-
-#
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Example:
-# Redirect permanent /foo http://www.example.com/bar
-
<IfModule mime_module>