Minor configuration changes to resync with upstream:

 * Docs are now at http://httpd.apache.org/docs/2.0/ instead
     of at http://httpd.apache.org/docs-2.0/
 * Use FilesMatch instead of Files ~ to avoid confusion
 * Remove AddDefaultCharset from the default configuration because
     setting a site-wide default does more harm than good.
	 This also fixes bug 107299.
 * Added more BrowserMatch items to deal with bad clients

1 files changed, 11 insertions, 20 deletions

diff --git a/2.0/conf/httpd.conf b/2.0/conf/httpd.conf
index 63153c0..584450c 100644
--- a/2.0/conf/httpd.conf
+++ b/2.0/conf/httpd.conf
@@ -17,7 +17,7 @@
 #
 # This is the main Apache server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about
+# See <URL:http://httpd.apache.org/docs/2.0/> for detailed information about
 # the directives.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -56,7 +56,7 @@
 #
 # NOTE!  If you intend to place this on an NFS (or otherwise network)
 # mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>);
+# at <URL:http://httpd.apache.org/docs/2.0/mod/mpm_common.html#lockfile>);
 # you will save yourself a lot of trouble.
 #
 # Do NOT add a slash at the end of the directory path.
@@ -325,7 +325,7 @@ LoadModule include_module                modules/mod_include.so
 # 
 # WARNING: Enabling these modules can be dangerous! 
 #   READ THE DOCUMENTATION FIRST:
-#   http://httpd.apache.org/docs-2.0/mod/mod_proxy.html
+#   http://httpd.apache.org/docs/2.0/mod/mod_proxy.html
 <IfDefine PROXY>
     LoadModule proxy_module                  modules/mod_proxy.so
     LoadModule proxy_connect_module          modules/mod_proxy_connect.so
@@ -502,10 +502,10 @@ AccessFileName .htaccess
 # 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>
 
 #
 # TypesConfig describes where the mime.types file (or equivalent) is
@@ -549,7 +549,7 @@ HostnameLookups Off
 # The default is on; turn this off if you serve from NFS-mounted 
 # filesystems.  On some systems, turning it off (regardless of
 # filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
+# http://httpd.apache.org/docs/2.0/mod/core.html#enablemmap
 #
 #EnableMMAP off
 
@@ -558,7 +558,7 @@ HostnameLookups Off
 # used  to deliver files (assuming that the OS supports it).
 # The default is on; turn this off if you serve from NFS-mounted 
 # filesystems.  Please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile
+# http://httpd.apache.org/docs/2.0/mod/core.html#enablesendfile
 #
 #EnableSendfile off
 
@@ -850,18 +850,6 @@ LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt
 ForceLanguagePriority Prefer Fallback
 
 #
-# Specify a default charset for all pages sent out. This is
-# always a good idea and opens the door for future internationalisation
-# of your web site, should you ever want it. Specifying it as
-# a default does little harm; as the standard dictates that a page
-# is in iso-8859-1 (latin1) unless specified otherwise i.e. you
-# are merely stating the obvious. There are also some security
-# reasons in browsers, related to javascript and URL parsing
-# which encourage you to always set a default char set.
-#
-AddDefaultCharset ISO-8859-1
-
-#
 # Commonly used filename extensions to character sets. You probably
 # want to avoid clashes with the language extensions, unless you
 # are good at carefully testing your setup after each change.
@@ -1053,9 +1041,12 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
 #
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
 BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
 BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 
 #
 # Allow server status reports generated by mod_status,