Merge r1929706, r1930012 from trunk: [docs CTR]

feat: add vnd.sqlite3 mime type and extensions

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #563

feat: add HEIC, HEIF and related mime types

See https://en.wikipedia.org/wiki/High_Efficiency_Image_File_Format

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #580

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1930714 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/changes-entries/mime-types.txt b/changes-entries/mime-types.txt
new file mode 100644 (file)
index 0000000..dd11d3a
--- /dev/null
+++ b/changes-entries/mime-types.txt
@@ -0,0 +1,2 @@
+  *) Updated conf/mime.types: added vnd.sqlite3, HEIC, HEIF
+     [Alexandru Mărășteanu <hello alexei.ro>]

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 92ee7178aaf6eaf7fec4274bf5ac234cdcae0fd2..b94996799e2ea5d253e358498988f0120e0e0942 100644 (file)
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -1090,6 +1090,7 @@ application/vnd.smart.teacher                     teacher
 application/vnd.solent.sdkm+xml                        sdkm sdkd
 application/vnd.spotfire.dxp                   dxp
 application/vnd.spotfire.sfs                   sfs
+application/vnd.sqlite3                                        sqlite sqlite3
 # application/vnd.sss-cod
 # application/vnd.sss-dtf
 # application/vnd.sss-ntf
@@ -1547,6 +1548,10 @@ image/cgm                                        cgm
 # image/fits
 image/g3fax                                    g3
 image/gif                                      gif
+image/heic                                     heic
+image/heic-sequence                    heics
+image/heif                                     heif
+image/heif-sequence                    heifs
 image/ief                                      ief
 # image/jls
 # image/jp2

diff --git a/test/pyhttpd/conf/mime.types b/test/pyhttpd/conf/mime.types
index 83fd4dcb4046b256c17e797d976bc5b0aaa7c2c9..fa718c2e341906aeebeeac53e7a4125d7e7a26ed 100644 (file)
--- a/test/pyhttpd/conf/mime.types
+++ b/test/pyhttpd/conf/mime.types
@@ -890,6 +890,7 @@ application/vnd.smart.teacher                       teacher
 application/vnd.solent.sdkm+xml                        sdkm sdkd
 application/vnd.spotfire.dxp                   dxp
 application/vnd.spotfire.sfs                   sfs
+application/vnd.sqlite3                                        sqlite sqlite3
 # application/vnd.sss-cod
 # application/vnd.sss-dtf
 # application/vnd.sss-ntf
@@ -1314,6 +1315,10 @@ image/cgm                                        cgm
 # image/fits
 image/g3fax                                    g3
 image/gif                                      gif
+image/heic                                     heic
+image/heic-sequence                    heics
+image/heif                                     heif
+image/heif-sequence                    heifs
 image/ief                                      ief
 # image/jp2
 image/jpeg                                     jpeg jpg jpe