yoavs       2004/11/17 06:35:30

  Modified:    catalina/src/conf web.xml
               webapps/docs changelog.xml
  Log:
  Bugzilla 32235: sync conf/web.xml MIME types with Apache httpd
  
  Revision  Changes    Path
  1.53      +33 -5     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.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- web.xml   19 Oct 2004 17:25:12 -0000      1.52
  +++ web.xml   17 Nov 2004 14:35:30 -0000      1.53
  @@ -469,7 +469,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>
  @@ -592,6 +592,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>
  @@ -664,6 +668,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>
  @@ -736,6 +744,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>
  @@ -788,6 +800,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>
  @@ -844,20 +860,24 @@
           <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>
       <mime-mapping>
           <extension>xht</extension>
  -        <mime-type>application/xhtml</mime-type>
  +        <mime-type>application/xhtml+xml</mime-type>
       </mime-mapping>
       <mime-mapping>
           <extension>xhtml</extension>
  -        <mime-type>application/xhtml</mime-type>
  +        <mime-type>application/xhtml+xml</mime-type>
       </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>
  @@ -865,7 +885,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>
  
  
  
  1.164     +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.163
  retrieving revision 1.164
  diff -u -r1.163 -r1.164
  --- changelog.xml     13 Nov 2004 22:10:52 -0000      1.163
  +++ changelog.xml     17 Nov 2004 14:35:30 -0000      1.164
  @@ -35,6 +35,9 @@
         <update>
           <bug>31912</bug>: Add PNG and CSS file types to replication filter 
default. (yoavs)
         </update>
  +      <update>
  +        <bug>32235</bug>: Sync 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]

Reply via email to