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 2023/07/17 09:52:07 UTC
svn commit: r1911060 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/mime_update.txt docs/conf/mime.types
Author: jorton
Date: Mon Jul 17 09:52:06 2023
New Revision: 1911060
URL: http://svn.apache.org/viewvc?rev=1911060&view=rev
Log:
Merge r1884511, r1901273, r1910843, r1910849 from trunk:
Add .opus extension for audio/ogg mimetype, per RFC 7845
RFC 7845: https://tools.ietf.org/html/rfc7845#section-9
Submitted by: Richard de Boer <richard tubul.net>
Github: closes #144
Merge of PR 318:
*) core: the conf/mime.types has been updated in conformance with RFC 9239:
- .js moved from 'application/javascript' to 'text/javascript'
- .mjs was added as 'text/javascript'
[Mathias Bynens <@mathiasbynens> via PR 318]
Add application/vnd.geogebra.slides mime type
Submitted by: Zbynek Konecny <zbynek1729 gmail.com>
Github: closes #207
Add WebAssembly MIME type and file extension
Submitted by: Dave Hodder <dmh dmh.org.uk>
Github: closes #332
Reviewed by: jorton, icing, covener
Added:
httpd/httpd/branches/2.4.x/changes-entries/mime_update.txt
- copied, changed from r1901273, httpd/httpd/trunk/changes-entries/mime_update.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/conf/mime.types
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1884511,1892413,1901273,1910843,1910849
Copied: httpd/httpd/branches/2.4.x/changes-entries/mime_update.txt (from r1901273, httpd/httpd/trunk/changes-entries/mime_update.txt)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/changes-entries/mime_update.txt?p2=httpd/httpd/branches/2.4.x/changes-entries/mime_update.txt&p1=httpd/httpd/trunk/changes-entries/mime_update.txt&r1=1901273&r2=1911060&rev=1911060&view=diff
==============================================================================
--- httpd/httpd/trunk/changes-entries/mime_update.txt (original)
+++ httpd/httpd/branches/2.4.x/changes-entries/mime_update.txt Mon Jul 17 09:52:06 2023
@@ -1,4 +1,9 @@
- *) core: the conf/mime.types has been updated in conformance with RFC 9239:
+ *) core: Updated conf/mime.types:
- .js moved from 'application/javascript' to 'text/javascript'
- .mjs was added as 'text/javascript'
- [Mathias Bynens <@mathiasbynens> via PR 318]
\ No newline at end of file
+ - add .opus ('audio/ogg')
+ - add 'application/vnd.geogebra.slides'
+ - add WebAssembly MIME types and extension
+ [Mathias Bynens <@mathiasbynens> via PR 318,
+ Richard de Boer <richard tubul.net>, Dave Hodder <dmh dmh.org.uk>,
+ Zbynek Konecny <zbynek1729 gmail.com>]
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=1911060&r1=1911059&r2=1911060&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/mime.types (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/mime.types Mon Jul 17 09:52:06 2023
@@ -142,7 +142,7 @@ application/ipfix ipfix
application/java-archive jar
application/java-serialized-object ser
application/java-vm class
-application/javascript js
+# application/javascript
# application/jose
# application/jose+json
# application/jrd+json
@@ -585,6 +585,7 @@ application/vnd.genomatix.tuxedo txd
# application/vnd.geo+json
# application/vnd.geocube+xml
application/vnd.geogebra.file ggb
+application/vnd.geogebra.slides ggs
application/vnd.geogebra.tool ggt
application/vnd.geometry-explorer gex gre
application/vnd.geonext gxt
@@ -1212,6 +1213,7 @@ application/vnd.zul zir zirz
application/vnd.zzazz.deck+xml zaz
application/voicexml+xml vxml
# application/vq-rtcpxr
+application/wasm wasm
# application/watcherinfo+xml
# application/whoispp-query
# application/whoispp-response
@@ -1439,7 +1441,7 @@ audio/mp4 m4a mp4a
audio/mpeg mpga mp2 mp2a mp3 m2a m3a
# audio/mpeg4-generic
# audio/musepack
-audio/ogg oga ogg spx
+audio/ogg oga ogg spx opus
# audio/opus
# audio/parityfec
# audio/pcma
@@ -1686,7 +1688,7 @@ text/csv csv
# text/fwdred
# text/grammar-ref-list
text/html html htm
-# text/javascript
+text/javascript js mjs
# text/jcr-cnd
# text/markdown
# text/mizar