Author: keith
Date: Tue Mar 14 12:11:33 2006
New Revision: 385869
URL: http://svn.apache.org/viewcvs?rev=385869&view=rev
Log:
[27617]
Remove duplicate extensions hqx, svg, doc, ppt
Add extensions ico, pps, vrml
Sync all existing types with httpd mime.types
Reorder to maintain the sort precedent (alpha by extension)
Modified:
tomcat/container/tc5.5.x/catalina/src/conf/web.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/conf/web.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/conf/web.xml?rev=385869&r1=385868&r2=385869&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/conf/web.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/web.xml Tue Mar 14 12:11:33 2006
@@ -537,7 +537,7 @@
</mime-mapping>
<mime-mapping>
<extension>cdf</extension>
- <mime-type>application/x-cdf</mime-type>
+ <mime-type>application/x-netcdf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>cer</extension>
@@ -608,10 +608,6 @@
<mime-type>application/x-hdf</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>hqx</extension>
- <mime-type>application/mac-binhex40</mime-type>
- </mime-mapping>
- <mime-mapping>
<extension>htc</extension>
<mime-type>text/x-component</mime-type>
</mime-mapping>
@@ -628,6 +624,10 @@
<mime-type>application/mac-binhex40</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>ico</extension>
+ <mime-type>image/x-icon</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>ief</extension>
<mime-type>image/ief</mime-type>
</mime-mapping>
@@ -673,7 +673,7 @@
</mime-mapping>
<mime-mapping>
<extension>kar</extension>
- <mime-type>audio/x-midi</mime-type>
+ <mime-type>audio/midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>latex</extension>
@@ -701,15 +701,15 @@
</mime-mapping>
<mime-mapping>
<extension>mid</extension>
- <mime-type>audio/x-midi</mime-type>
+ <mime-type>audio/midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>midi</extension>
- <mime-type>audio/x-midi</mime-type>
+ <mime-type>audio/midi</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mif</extension>
- <mime-type>application/x-mif</mime-type>
+ <mime-type>application/vnd.mif</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mov</extension>
@@ -725,11 +725,11 @@
</mime-mapping>
<mime-mapping>
<extension>mp2</extension>
- <mime-type>audio/x-mpeg</mime-type>
+ <mime-type>audio/mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mp3</extension>
- <mime-type>audio/x-mpeg</mime-type>
+ <mime-type>audio/mpeg</mime-type>
</mime-mapping>
<mime-mapping>
<extension>mpa</extension>
@@ -757,7 +757,7 @@
</mime-mapping>
<mime-mapping>
<extension>ms</extension>
- <mime-type>application/x-wais-source</mime-type>
+ <mime-type>application/x-troff-ms</mime-type>
</mime-mapping>
<mime-mapping>
<extension>nc</extension>
@@ -816,8 +816,12 @@
<mime-type>image/x-portable-pixmap</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>pps</extension>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>ppt</extension>
- <mime-type>application/powerpoint</mime-type>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
</mime-mapping>
<mime-mapping>
<extension>ps</extension>
@@ -861,7 +865,7 @@
</mime-mapping>
<mime-mapping>
<extension>rtf</extension>
- <mime-type>application/rtf</mime-type>
+ <mime-type>text/rtf</mime-type>
</mime-mapping>
<mime-mapping>
<extension>rtx</extension>
@@ -908,6 +912,10 @@
<mime-type>image/svg+xml</mime-type>
</mime-mapping>
<mime-mapping>
+ <extension>svgz</extension>
+ <mime-type>image/svg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
<extension>swf</extension>
<mime-type>application/x-shockwave-flash</mime-type>
</mime-mapping>
@@ -964,62 +972,22 @@
<mime-type>application/x-ustar</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>vxml</extension>
- <mime-type>application/voicexml+xml</mime-type>
+ <extension>vrml</extension>
+ <mime-type>model/vrml</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>xbm</extension>
- <mime-type>image/x-xbitmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xht</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xhtml</extension>
- <mime-type>application/xhtml+xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xml</extension>
- <mime-type>application/xml</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xpm</extension>
- <mime-type>image/x-xpixmap</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>xsl</extension>
- <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>
+ <extension>vsd</extension>
+ <mime-type>application/x-visio</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>xwd</extension>
- <mime-type>image/x-xwindowdump</mime-type>
+ <extension>vxml</extension>
+ <mime-type>application/voicexml+xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>wav</extension>
<mime-type>audio/x-wav</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>svg</extension>
- <mime-type>image/svg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>svgz</extension>
- <mime-type>image/svg</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>vsd</extension>
- <mime-type>application/x-visio</mime-type>
- </mime-mapping>
- <mime-mapping>
<!-- Wireless Bitmap -->
<extension>wbmp</extension>
<mime-type>image/vnd.wap.wbmp</mime-type>
@@ -1046,31 +1014,59 @@
</mime-mapping>
<mime-mapping>
<extension>wrl</extension>
- <mime-type>x-world/x-vrml</mime-type>
+ <mime-type>model/vrml</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>Z</extension>
- <mime-type>application/x-compress</mime-type>
+ <extension>xbm</extension>
+ <mime-type>image/x-xbitmap</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>z</extension>
- <mime-type>application/x-compress</mime-type>
+ <extension>xht</extension>
+ <mime-type>application/xhtml+xml</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>zip</extension>
- <mime-type>application/zip</mime-type>
+ <extension>xhtml</extension>
+ <mime-type>application/xhtml+xml</mime-type>
</mime-mapping>
<mime-mapping>
<extension>xls</extension>
<mime-type>application/vnd.ms-excel</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>doc</extension>
- <mime-type>application/vnd.ms-word</mime-type>
+ <extension>xml</extension>
+ <mime-type>application/xml</mime-type>
</mime-mapping>
<mime-mapping>
- <extension>ppt</extension>
- <mime-type>application/vnd.ms-powerpoint</mime-type>
+ <extension>xpm</extension>
+ <mime-type>image/x-xpixmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xsl</extension>
+ <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>
+ <mime-type>image/x-xwindowdump</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>Z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zip</extension>
+ <mime-type>application/zip</mime-type>
</mime-mapping>
<!-- ==================== Default Welcome File List ===================== -->
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=385869&r1=385868&r2=385869&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Mar 14 12:11:33 2006
@@ -26,6 +26,9 @@
<fix>
Add missing REQUEST_URI environment variable to CGI environment.
(markt)
</fix>
+ <fix>
+ <bug>27617</bug>: Sync existing mime types with httpd. (keith)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
