Author: markt
Date: Fri Nov 17 19:56:21 2017
New Revision: 1815615

URL: http://svn.apache.org/viewvc?rev=1815615&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61658
Update MIME mappings for fonts to use font/* as per RFC8081

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

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1815615&r1=1815614&r2=1815615&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Fri Nov 17 19:56:21 2017
@@ -2900,7 +2900,7 @@
     </mime-mapping>
     <mime-mapping>
         <extension>otf</extension>
-        <mime-type>application/x-font-otf</mime-type>
+        <mime-type>font/otf</mime-type>
     </mime-mapping>
     <mime-mapping>
         <!-- OpenDocument Drawing Template -->
@@ -3939,11 +3939,11 @@
     </mime-mapping>
     <mime-mapping>
         <extension>ttc</extension>
-        <mime-type>application/x-font-ttf</mime-type>
+        <mime-type>font/collection</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>ttf</extension>
-        <mime-type>application/x-font-ttf</mime-type>
+        <mime-type>font/ttf</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>ttl</extension>
@@ -4332,7 +4332,7 @@
     </mime-mapping>
     <mime-mapping>
         <extension>woff</extension>
-        <mime-type>application/x-font-woff</mime-type>
+        <mime-type>font/woff</mime-type>
     </mime-mapping>
     <mime-mapping>
         <extension>woff2</extension>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1815615&r1=1815614&r2=1815615&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 17 19:56:21 2017
@@ -210,6 +210,10 @@
         Add generation of a SHA-512 hash for release artifacts to the build
         script. (markt)
       </add>
+      <fix>
+        <bug>61658</bug>: Update MIME mappings for fonts to use
+        <code>font/*</code> as per RFC8081. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



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

Reply via email to