summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-01-19 09:47:05 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-01-19 09:47:05 +0000
commit09872081221574fd452c3d18f732823edf8a9b7c (patch)
tree4734179d96c229ea1310b8a25f7f446834ae3858
parentremove obsolete CVE patches; bump SNI patch; bump ITK patch (diff)
downloadapache-09872081221574fd452c3d18f732823edf8a9b7c.tar.gz
apache-09872081221574fd452c3d18f732823edf8a9b7c.tar.bz2
apache-09872081221574fd452c3d18f732823edf8a9b7c.zip
fix WebDAV on OS X Leopard; cleanup
-rw-r--r--2.2/conf/httpd.conf7
-rw-r--r--2.2/conf/modules.d/45_mod_dav.conf2
-rw-r--r--2.2/patches/03_all_gentoo_apache-tools.patch (renamed from 2.2/patches/03_all_gentoo-apache-tools.patch)0
3 files changed, 5 insertions, 4 deletions
diff --git a/2.2/conf/httpd.conf b/2.2/conf/httpd.conf
index 69c961a..a919133 100644
--- a/2.2/conf/httpd.conf
+++ b/2.2/conf/httpd.conf
@@ -25,7 +25,7 @@
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "var/log/apache2/foo.log"
+# with "/", the value of ServerRoot is prepended -- so "var/log/apache2/foo_log"
# with ServerRoot set to "/usr" will be interpreted by the
# server as "/usr/var/log/apache2/foo.log".
@@ -49,7 +49,8 @@ ServerRoot "/usr/lib/apache2"
# Example:
# LoadModule foo_module modules/mod_foo.so
#
-# GENTOO: Automatically defined based on apache2-builtin-mods at compile time
+# GENTOO: Automatically defined based on APACHE2_MODULES USE_EXPAND variable.
+# Do not change manually, it will be overwritten on upgrade.
#
# The following modules are considered as the default configuration.
# If you wish to disable one of them, you may have to alter other
@@ -74,7 +75,7 @@ Group apache
# or to modify the default configuration of the server.
#
# To know which flag to add to APACHE2_OPTS, look at the first line of the
-# the file, which will usually be an <IfDefine OPTION> where OPTIONS is the
+# the file, which will usually be an <IfDefine OPTION> where OPTION is the
# flag to use.
Include /etc/apache2/modules.d/*.conf
diff --git a/2.2/conf/modules.d/45_mod_dav.conf b/2.2/conf/modules.d/45_mod_dav.conf
index 362ef52..b15ca01 100644
--- a/2.2/conf/modules.d/45_mod_dav.conf
+++ b/2.2/conf/modules.d/45_mod_dav.conf
@@ -45,7 +45,7 @@ Alias /uploads "/var/www/uploads"
BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
BrowserMatch "MS FrontPage" redirect-carefully
BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[01234]" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[012345]" redirect-carefully
BrowserMatch "^gnome-vfs/1.0" redirect-carefully
BrowserMatch "^XML Spy" redirect-carefully
BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
diff --git a/2.2/patches/03_all_gentoo-apache-tools.patch b/2.2/patches/03_all_gentoo_apache-tools.patch
index f4b6612..f4b6612 100644
--- a/2.2/patches/03_all_gentoo-apache-tools.patch
+++ b/2.2/patches/03_all_gentoo_apache-tools.patch