From 3d106572c2dba675b06fb8277954391dbb248f78 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 17 Jul 2023 09:52:06 +0000 Subject: [PATCH] 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 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 Github: closes #207 Add WebAssembly MIME type and file extension Submitted by: Dave Hodder Github: closes #332 Reviewed by: jorton, icing, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911060 13f79535-47bb-0310-9956-ffa450edef68 --- changes-entries/mime_update.txt | 9 +++++++++ docs/conf/mime.types | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 changes-entries/mime_update.txt diff --git a/changes-entries/mime_update.txt b/changes-entries/mime_update.txt new file mode 100644 index 00000000000..c28f5a44b6f --- /dev/null +++ b/changes-entries/mime_update.txt @@ -0,0 +1,9 @@ + *) core: Updated conf/mime.types: + - .js moved from 'application/javascript' to 'text/javascript' + - .mjs was added as 'text/javascript' + - add .opus ('audio/ogg') + - add 'application/vnd.geogebra.slides' + - add WebAssembly MIME types and extension + [Mathias Bynens <@mathiasbynens> via PR 318, + Richard de Boer , Dave Hodder , + Zbynek Konecny ] diff --git a/docs/conf/mime.types b/docs/conf/mime.types index 7508c262550..2957b67d25e 100644 --- a/docs/conf/mime.types +++ b/docs/conf/mime.types @@ -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 -- 2.47.2