Merge r1915651, r1916381, r1920589, r1923133 from trunk: [under CTR for docs]

mod_dav: Update redirect-carefully example BrowserMatch config to
match more recent client versions.

PR: 66148, 67039
Submitted by: Michal Maloszewski <michal.maloszewski canonical.com>

Fix BrowserMatch for gvfs.

PR: 66148
Submitted by: Romain Tartière <romain blogreen.org>

Add jxl mime type

Submitted by: printfn <printfn users.noreply.github.com>
Github: closes #478

Fix typo in charset.conv

\"Croation\" is a misspelling. It should be \"Croatian\".

Submitted by: Michael Hospedales <hospedales me.com>
Github: closes #508

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923263 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/changes-entries/dav-browsermatch.txt b/changes-entries/dav-browsermatch.txt
new file mode 100644 (file)
index 0000000..81cc782
--- /dev/null
+++ b/changes-entries/dav-browsermatch.txt
@@ -0,0 +1,4 @@
+  *) mod_dav: Update redirect-carefully example BrowserMatch config
+     to match more recent client versions.  PR 66148, 67039.
+     [Michal Maloszewski <michal.maloszewski canonical.com>,
+      Romain Tartière <romain blogreen.org>]

diff --git a/docs/conf/charset.conv b/docs/conf/charset.conv
index 3cd6fa9d892041a43e071d090bab48fca72dc03e..bd7ae87c229b4848a5eca7c1ed8b5d849c4c2417 100644 (file)
--- a/docs/conf/charset.conv
+++ b/docs/conf/charset.conv
@@ -12,7 +12,7 @@ zh-cn       GB2312      Chinese-Simplified
 zh-tw       Cp950       Chinese
 cs          ISO-8859-2  Czech
 hu          ISO-8859-2  Hungarian
-hr          ISO-8859-2  Croation
+hr          ISO-8859-2  Croatian
 pl          ISO-8859-2  Polish
 ro          ISO-8859-2  Romanian
 sr          ISO-8859-2  Serbian
@@ -52,4 +52,4 @@ ar          ISO-8859-6  Arabic
 et          ISO-8859-1  Estonian
 lv          ISO-8859-2  Latvian
 lt          ISO-8859-2  Lithuanian
-                        
\ No newline at end of file
+                        

diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in
index f1d35e04c2059ffad8da2d48cd48417550b7873f..2bf55455e0a4cd13906e05e91764d8f7c97d383d 100644 (file)
--- a/docs/conf/extra/httpd-dav.conf.in
+++ b/docs/conf/extra/httpd-dav.conf.in
@@ -43,8 +43,11 @@ Alias /uploads "@@ServerRoot@@/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 "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^WebDAVFS/1\.[012]" redirect-carefully
+BrowserMatch "^gnome-vfs/1\.0" redirect-carefully
+BrowserMatch "^gvfs/1" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 BrowserMatch " Konqueror/4" redirect-carefully
+BrowserMatch " Konqueror/5" redirect-carefully
+BrowserMatch " dolphin/" redirect-carefully

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 98a8e8451af4e2666298809801309d5edb4c9e80..92ee7178aaf6eaf7fec4274bf5ac234cdcae0fd2 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -1553,6 +1553,7 @@ image/ief                                 ief
 image/jpeg                                     jpeg jpg jpe
 # image/jpm
 # image/jpx
+image/jxl                                      jxl
 image/ktx                                      ktx
 # image/naplps
 image/png                                      png

diff --git a/test/pyhttpd/conf/mime.types b/test/pyhttpd/conf/mime.types
index 2db5c0913b221b98a41a96ad8550998cb70c6bfa..83fd4dcb4046b256c17e797d976bc5b0aaa7c2c9 100644 (file)
--- a/test/pyhttpd/conf/mime.types
+++ b/test/pyhttpd/conf/mime.types
@@ -1319,6 +1319,7 @@ image/ief                                 ief
 image/jpeg                                     jpeg jpg jpe
 # image/jpm
 # image/jpx
+image/jxl                                      jxl
 image/ktx                                      ktx
 # image/naplps
 image/png                                      png