From 8e4b57a4a59cb7e114c436df8f1b9ae9454b5a87 Mon Sep 17 00:00:00 2001
From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 10 Mar 2009 12:10:20 +0000
Subject: [PATCH] - Add xiph mime types, after reading a blog.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@752078 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/web.xml | 45 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index b529c1fe9..43de8ead8 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -798,10 +798,6 @@
         <mime-type>application/vnd.oasis.opendocument.text</mime-type>
     </mime-mapping>
     <mime-mapping>
-        <extension>ogg</extension>
-        <mime-type>application/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
         <!-- OpenDocument Drawing Template -->
         <extension>otg </extension>
         <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
@@ -826,6 +822,47 @@
         <extension>ott</extension>
         <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
     </mime-mapping>
+    <!-- xiph mime types -->
+    <mime-mapping>
+        <extension>ogx</extension>
+        <mime-type>application/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>ogv</extension>
+        <mime-type>video/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>oga</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>ogg</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>spx</extension>
+        <mime-type>audio/ogg</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>flac</extension>
+        <mime-type>audio/flac</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>anx</extension>
+        <mime-type>application/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>axa</extension>
+        <mime-type>audio/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>axv</extension>
+        <mime-type>video/annodex</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>xspf</extension>
+        <mime-type>application/xspf+xml</mime-type>
+    </mime-mapping>
     <mime-mapping>
         <extension>pbm</extension>
         <mime-type>image/x-portable-bitmap</mime-type>
-- 
2.11.0