You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2025/01/20 12:53:06 UTC
svn commit: r1923263 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/dav-browsermatch.txt docs/conf/charset.conv docs/conf/extra/httpd-dav.conf.in docs/conf/mime.types test/pyhttpd/conf/mime.types
Author: jorton
Date: Mon Jan 20 12:53:06 2025
New Revision: 1923263
URL: http://svn.apache.org/viewvc?rev=1923263&view=rev
Log:
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
Added:
httpd/httpd/branches/2.4.x/changes-entries/dav-browsermatch.txt
- copied, changed from r1915651, httpd/httpd/trunk/changes-entries/dav-browsermatch.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/conf/charset.conv
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-dav.conf.in
httpd/httpd/branches/2.4.x/docs/conf/mime.types
httpd/httpd/branches/2.4.x/test/pyhttpd/conf/mime.types
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1915651,1916381,1920589,1923133
Copied: httpd/httpd/branches/2.4.x/changes-entries/dav-browsermatch.txt (from r1915651, httpd/httpd/trunk/changes-entries/dav-browsermatch.txt)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/changes-entries/dav-browsermatch.txt?p2=httpd/httpd/branches/2.4.x/changes-entries/dav-browsermatch.txt&p1=httpd/httpd/trunk/changes-entries/dav-browsermatch.txt&r1=1915651&r2=1923263&rev=1923263&view=diff
==============================================================================
--- httpd/httpd/trunk/changes-entries/dav-browsermatch.txt (original)
+++ httpd/httpd/branches/2.4.x/changes-entries/dav-browsermatch.txt Mon Jan 20 12:53:06 2025
@@ -1,3 +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>]
+ [Michal Maloszewski <michal.maloszewski canonical.com>,
+ Romain Tartière <romain blogreen.org>]
Modified: httpd/httpd/branches/2.4.x/docs/conf/charset.conv
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/charset.conv?rev=1923263&r1=1923262&r2=1923263&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/charset.conv (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/charset.conv Mon Jan 20 12:53:06 2025
@@ -12,7 +12,7 @@ zh-cn GB2312 Chinese-Simplifi
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
+
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-dav.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-dav.conf.in?rev=1923263&r1=1923262&r2=1923263&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-dav.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-dav.conf.in Mon Jan 20 12:53:06 2025
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/mime.types?rev=1923263&r1=1923262&r2=1923263&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/mime.types Mon Jan 20 12:53:06 2025
@@ -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
Modified: httpd/httpd/branches/2.4.x/test/pyhttpd/conf/mime.types
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/pyhttpd/conf/mime.types?rev=1923263&r1=1923262&r2=1923263&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/pyhttpd/conf/mime.types (original)
+++ httpd/httpd/branches/2.4.x/test/pyhttpd/conf/mime.types Mon Jan 20 12:53:06 2025
@@ -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