Add a DAV example config, and move the BrowserMatch's that are specific

to mod_dav to that example.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160173 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in
new file mode 100644 (file)
index 0000000..f3f0699
--- /dev/null
+++ b/docs/conf/extra/httpd-dav.conf.in
@@ -0,0 +1,45 @@
+#
+# Distributed authoring and versioning (WebDAV)
+#
+# Required modules: mod_dav, mod_dav_fs, mod_setenvif, mod_alias
+#                   mod_auth_digest, mod_authn_file
+#
+
+# The following example gives DAV write access to a directory called
+# "uploads" under the ServerRoot directory.
+#
+# The User/Group specified in httpd.conf needs to have write permissions
+# on the directory where the DavLockDB is placed and on any directory where
+# "Dav On" is specified.
+
+DavLockDB "@@ServerRoot@@/var/DavLock"
+
+Alias /uploads "@@ServerRoot@@/uploads"
+
+<Directory "@@ServerRoot@@/uploads">
+    Dav On
+
+    AuthType Digest
+    AuthName DAV-upload
+    # You can use the htdigest program to create the password database:
+    #   htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin
+    AuthUserFile "@@ServerRoot@@/user.passwd"
+
+    # Allow universal read-access, but writes are restricted
+    # to the admin user.
+    <LimitExcept GET OPTIONS>
+        require user admin
+    </LimitExcept>
+</Directory>
+
+#
+# The following directives disable redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with several clients that do not appropriately handle 
+# redirects for folders with DAV methods.
+#
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
\ No newline at end of file

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index f26209f5581ca38c1f54c37801ede57db04068c6..572105ec4584856d55de03feac7016d0335eb05f 100644 (file)
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -405,19 +405,6 @@ DefaultType text/plain
     BrowserMatch "RealPlayer 4\.0" force-response-1.0
     BrowserMatch "Java/1\.0" force-response-1.0
     BrowserMatch "JDK/1\.0" force-response-1.0
-
-    #
-    # The following directive disables redirects on non-GET requests for
-    # a directory that does not include the trailing slash.  This fixes a 
-    # problem with Microsoft WebFolders which does not appropriately handle 
-    # redirects for folders with DAV methods.
-    # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
-    #
-    BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
-    BrowserMatch "^WebDrive" redirect-carefully
-    BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
-    BrowserMatch "^gnome-vfs/1.0" redirect-carefully
-    BrowserMatch "^XML Spy" redirect-carefully
 </IfModule>
 
 # EnableMMAP and EnableSendfile: On systems that support it,