Return-Path: 
 <dev-return-80302-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 17157 invoked from network); 15 Apr 2007 20:04:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Apr 2007 20:04:55 -0000
Received: (qmail 18169 invoked by uid 500); 15 Apr 2007 20:04:53 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 18114 invoked by uid 500); 15 Apr 2007 20:04:53 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 18101 invoked by uid 500); 15 Apr 2007 20:04:53 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 18098 invoked by uid 99); 15 Apr 2007 20:04:53 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Apr 2007 13:04:53 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Apr 2007 13:04:46 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 97B0E1A9838; Sun, 15 Apr 2007 13:04:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r529060 - in /tomcat/tc6.0.x/trunk: conf/web.xml
 webapps/docs/changelog.xml
Date: Sun, 15 Apr 2007 20:04:26 -0000
To: tomcat-dev@jakarta.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070415200426.97B0E1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Sun Apr 15 13:04:25 2007
New Revision: 529060

URL: http://svn.apache.org/viewvc?view=rev&rev=529060
Log:
Fix bug 41990. Add some new mime-type mappings.

Modified:
    tomcat/tc6.0.x/trunk/conf/web.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?view=diff&rev=529060&r1=529059&r2=529060
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Sun Apr 15 13:04:25 2007
@@ -734,6 +734,10 @@
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
     <mime-mapping>
+        <extension>mp4</extension>
+        <mime-type>video/mp4</mime-type>
+    </mime-mapping>
+    <mime-mapping>
         <extension>mpa</extension>
         <mime-type>audio/x-mpeg</mime-type>
     </mime-mapping>
@@ -1113,6 +1117,10 @@
         <!-- Compiled WML Script -->
         <extension>wmlscriptc</extension>
         <mime-type>application/vnd.wap.wmlscriptc</mime-type>
+    </mime-mapping>
+    <mime-mapping>
+        <extension>wmv</extension>
+        <mime-type>video/x-ms-wmv</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>wrl</extension>

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=529060&r1=529059&r2=529060
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 15 13:04:25 2007
@@ -21,6 +21,9 @@
         <bug>42039</bug> Log a stack trace if a servlet throws an
          UnavailableException. Patch provided by Kawasima Kazuh. (markt)
       </fix>
+      <fix>
+        <bug>41990</bug> Add some additional mime-type mappings. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org