yoavs 2004/11/17 06:20:00
Modified: catalina/src/conf Tag: TOMCAT_5_0 web.xml
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32235: sync mime types with httpd.
Revision Changes Path
No revision
No revision
1.39.2.3 +31 -3 jakarta-tomcat-catalina/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- web.xml 28 Sep 2004 22:19:32 -0000 1.39.2.2
+++ web.xml 17 Nov 2004 14:20:00 -0000 1.39.2.3
@@ -454,7 +454,7 @@
</mime-mapping>
<mime-mapping>
<extension>dtd</extension>
- <mime-type>text/plain</mime-type>
+ <mime-type>application/xml-dtd</mime-type>
</mime-mapping>
<mime-mapping>
<extension>dv</extension>
@@ -577,6 +577,10 @@
<mime-type>application/x-troff-man</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>mathml</extension>
+ <mime-type>application/mathml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>me</extension>
<mime-type>application/x-troff-me</mime-type>
</mime-mapping>
@@ -649,6 +653,10 @@
<mime-type>application/oda</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>ogg</extension>
+ <mime-type>application/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>pbm</extension>
<mime-type>image/x-portable-bitmap</mime-type>
</mime-mapping>
@@ -721,6 +729,10 @@
<mime-type>image/x-cmu-raster</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>rdf</extension>
+ <mime-type>application/rdf+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>rgb</extension>
<mime-type>image/x-rgb</mime-type>
</mime-mapping>
@@ -773,6 +785,10 @@
<mime-type>application/x-sv4crc</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>svg</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>swf</extension>
<mime-type>application/x-shockwave-flash</mime-type>
</mime-mapping>
@@ -829,6 +845,10 @@
<mime-type>application/x-ustar</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>vxml</extension>
+ <mime-type>application/voicexml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>xbm</extension>
<mime-type>image/x-xbitmap</mime-type>
</mime-mapping>
@@ -842,7 +862,7 @@
</mime-mapping>
<mime-mapping>
<extension>xml</extension>
- <mime-type>text/xml</mime-type>
+ <mime-type>application/xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xpm</extension>
@@ -850,7 +870,15 @@
</mime-mapping>
<mime-mapping>
<extension>xsl</extension>
- <mime-type>text/xml</mime-type>
+ <mime-type>application/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xslt</extension>
+ <mime-type>application/xslt+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xul</extension>
+ <mime-type>application/vnd.mozilla.xul+xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xwd</extension>
No revision
No revision
1.70.2.67 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.66
retrieving revision 1.70.2.67
diff -u -r1.70.2.66 -r1.70.2.67
--- changelog.xml 29 Oct 2004 14:45:07 -0000 1.70.2.66
+++ changelog.xml 17 Nov 2004 14:20:00 -0000 1.70.2.67
@@ -20,6 +20,9 @@
<update>
Update web.xml files to 2.4 schema (from 2.3 DTD) where applicable.
(yoavs)
</update>
+ <update>
+ <bug>32235</bug>: align conf/web.xml MIME types with Apache HTTPD.
(yoavs)
+ </update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
