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

Author: notroj

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>]

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
-                        
+                        

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

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

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