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]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901273 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/changes-entries/mime_update.txt b/changes-entries/mime_update.txt
new file mode 100644 (file)
index 0000000..b686212
--- /dev/null
+++ b/changes-entries/mime_update.txt
@@ -0,0 +1,4 @@
+  *) 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]
\ No newline at end of file

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 82efdfdda5fe87e2e6a2540d5ac6a3c89eb13bac..870176f77defa4b4c3e2f55bb52c2f4c3ac0f138 100644 (file)
--- 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
@@ -1686,7 +1686,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