From: Joe Orton <jorton@apache.org>
Date: Wed, 19 Jun 2024 10:48:05 +0000 (+0000)
Subject: Merge r1915514, r1918129 from trunk: [CTR for docs]
X-Git-Tag: 2.4.60-rc1-candidate~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=473c185903cb618ecaf31bd44b839b5a24d51b23;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1915514, r1918129 from trunk: [CTR for docs]

Add MPEG-TS file extensions

Submitted by: Mohamed Akram <mohd.akram outlook.com>
Github: closes #372


Add avif mime type

Submitted by: Adam Silverstein <adamsilverstein earthboundhosting.com>
Github: closes #451


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

diff --git a/docs/conf/mime.types b/docs/conf/mime.types
index 1b92ee1c83e..98a8e8451af 100644
--- a/docs/conf/mime.types
+++ b/docs/conf/mime.types
@@ -1538,6 +1538,7 @@ font/otf					otf
 font/ttf					ttf
 font/woff					woff
 font/woff2					woff2
+image/avif					avif
 image/bmp					bmp
 image/cgm					cgm
 # image/dicom-rle
@@ -1645,7 +1646,7 @@ model/vnd.gdl					gdl
 # model/vnd.gs.gdl
 model/vnd.gtw					gtw
 # model/vnd.moml+xml
-model/vnd.mts					mts
+# model/vnd.mts
 # model/vnd.opengex
 # model/vnd.parasolid.transmit.binary
 # model/vnd.parasolid.transmit.text
@@ -1784,7 +1785,7 @@ video/jpm					jpm jpgm
 video/mj2					mj2 mjp2
 # video/mp1s
 # video/mp2p
-# video/mp2t
+video/mp2t					ts m2t m2ts mts
 video/mp4					mp4 mp4v mpg4
 # video/mp4v-es
 video/mpeg					mpeg mpg mpe m1v m2v