Author: rjung
Date: Sun Feb 26 13:28:03 2012
New Revision: 1293831
URL: http://svn.apache.org/viewvc?rev=1293831&view=rev
Log:
Bring builtin mime types more in line with the
ones defined in our default web.xml.
I have only made the existing builtin types consistent,
not added new types. Note that the list in web.xml is
several hundred types longer but I don't think it makes
sense to define all of them as builtin.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1293831&r1=1293830&r2=1293831&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Sun Feb 26
13:28:03 2012
@@ -870,7 +870,7 @@ public class Tomcat {
"bmp", "image/bmp",
"body", "text/html",
"cdf", "application/x-cdf",
- "cer", "application/x-x509-ca-cert",
+ "cer", "application/pkix-cert",
"class", "application/java",
"cpio", "application/x-cpio",
"csh", "application/x-csh",
@@ -891,41 +891,39 @@ public class Tomcat {
"htc", "text/x-component",
"htm", "text/html",
"html", "text/html",
- "hqx", "application/mac-binhex40",
"ief", "image/ief",
"jad", "text/vnd.sun.j2me.app-descriptor",
"jar", "application/java-archive",
- "java", "text/plain",
+ "java", "text/x-java-source",
"jnlp", "application/x-java-jnlp-file",
"jpe", "image/jpeg",
"jpeg", "image/jpeg",
"jpg", "image/jpeg",
- "js", "text/javascript",
+ "js", "application/javascript",
"jsf", "text/plain",
"jspf", "text/plain",
- "kar", "audio/x-midi",
+ "kar", "audio/midi",
"latex", "application/x-latex",
"m3u", "audio/x-mpegurl",
"mac", "image/x-macpaint",
- "man", "application/x-troff-man",
+ "man", "text/troff",
"mathml", "application/mathml+xml",
- "me", "application/x-troff-me",
- "mid", "audio/x-midi",
- "midi", "audio/x-midi",
+ "me", "text/troff",
+ "mid", "audio/midi",
+ "midi", "audio/midi",
"mif", "application/x-mif",
"mov", "video/quicktime",
"movie", "video/x-sgi-movie",
- "mp1", "audio/x-mpeg",
- "mp2", "audio/x-mpeg",
- "mp3", "audio/x-mpeg",
+ "mp1", "audio/mpeg",
+ "mp2", "audio/mpeg",
+ "mp3", "audio/mpeg",
"mp4", "video/mp4",
- "mpa", "audio/x-mpeg",
+ "mpa", "audio/mpeg",
"mpe", "video/mpeg",
"mpeg", "video/mpeg",
"mpega", "audio/x-mpeg",
"mpg", "video/mpeg",
"mpv2", "video/mpeg2",
- "ms", "application/x-wais-source",
"nc", "application/x-netcdf",
"oda", "application/oda",
"odb", "application/vnd.oasis.opendocument.database",
@@ -947,7 +945,7 @@ public class Tomcat {
"oga", "audio/ogg",
"ogg", "audio/ogg",
"spx", "audio/ogg",
- "faca", "audio/flac",
+ "flac", "audio/flac",
"anx", "application/annodex",
"axa", "audio/annodex",
"axv", "video/annodex",
@@ -966,7 +964,7 @@ public class Tomcat {
"ppt", "application/vnd.ms-powerpoint",
"pps", "application/vnd.ms-powerpoint",
"ps", "application/postscript",
- "psd", "image/x-photoshop",
+ "psd", "image/vnd.adobe.photoshop",
"qt", "video/quicktime",
"qti", "image/x-quicktime",
"qtif", "image/x-quicktime",
@@ -974,13 +972,12 @@ public class Tomcat {
"rdf", "application/rdf+xml",
"rgb", "image/x-rgb",
"rm", "application/vnd.rn-realmedia",
- "roff", "application/x-troff",
+ "roff", "text/troff",
"rtf", "application/rtf",
"rtx", "text/richtext",
"sh", "application/x-sh",
"shar", "application/x-shar",
/*"shtml", "text/x-server-parsed-html",*/
- "smf", "audio/x-midi",
"sit", "application/x-stuffit",
"snd", "audio/basic",
"src", "application/x-wais-source",
@@ -989,7 +986,7 @@ public class Tomcat {
"svg", "image/svg+xml",
"svgz", "image/svg+xml",
"swf", "application/x-shockwave-flash",
- "t", "application/x-troff",
+ "t", "text/troff",
"tar", "application/x-tar",
"tcl", "application/x-tcl",
"tex", "application/x-tex",
@@ -997,7 +994,7 @@ public class Tomcat {
"texinfo", "application/x-texinfo",
"tif", "image/tiff",
"tiff", "image/tiff",
- "tr", "application/x-troff",
+ "tr", "text/troff",
"tsv", "text/tab-separated-values",
"txt", "text/plain",
"ulw", "audio/basic",
@@ -1013,15 +1010,15 @@ public class Tomcat {
"xslt", "application/xslt+xml",
"xul", "application/vnd.mozilla.xul+xml",
"xwd", "image/x-xwindowdump",
- "vsd", "application/x-visio",
+ "vsd", "application/vnd.visio",
"wav", "audio/x-wav",
"wbmp", "image/vnd.wap.wbmp",
"wml", "text/vnd.wap.wml",
"wmlc", "application/vnd.wap.wmlc",
- "wmls", "text/vnd.wap.wmlscript",
+ "wmls", "text/vnd.wap.wmlsc",
"wmlscriptc", "application/vnd.wap.wmlscriptc",
"wmv", "video/x-ms-wmv",
- "wrl", "x-world/x-vrml",
+ "wrl", "model/vrml",
"wspolicy", "application/wspolicy+xml",
"Z", "application/x-compress",
"z", "application/x-compress",
Modified:
tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java?rev=1293831&r1=1293830&r2=1293831&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java
(original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/coyote/lite/Tomcat.java
Sun Feb 26 13:28:03 2012
@@ -754,7 +754,7 @@ public class Tomcat {
"bmp", "image/bmp",
"body", "text/html",
"cdf", "application/x-cdf",
- "cer", "application/x-x509-ca-cert",
+ "cer", "application/pkix-cert",
"class", "application/java",
"cpio", "application/x-cpio",
"csh", "application/x-csh",
@@ -775,41 +775,39 @@ public class Tomcat {
"htc", "text/x-component",
"htm", "text/html",
"html", "text/html",
- "hqx", "application/mac-binhex40",
"ief", "image/ief",
"jad", "text/vnd.sun.j2me.app-descriptor",
"jar", "application/java-archive",
- "java", "text/plain",
+ "java", "text/x-java-source",
"jnlp", "application/x-java-jnlp-file",
"jpe", "image/jpeg",
"jpeg", "image/jpeg",
"jpg", "image/jpeg",
- "js", "text/javascript",
+ "js", "application/javascript",
"jsf", "text/plain",
"jspf", "text/plain",
- "kar", "audio/x-midi",
+ "kar", "audio/midi",
"latex", "application/x-latex",
"m3u", "audio/x-mpegurl",
"mac", "image/x-macpaint",
- "man", "application/x-troff-man",
+ "man", "text/troff",
"mathml", "application/mathml+xml",
- "me", "application/x-troff-me",
- "mid", "audio/x-midi",
- "midi", "audio/x-midi",
+ "me", "text/troff",
+ "mid", "audio/midi",
+ "midi", "audio/midi",
"mif", "application/x-mif",
"mov", "video/quicktime",
"movie", "video/x-sgi-movie",
- "mp1", "audio/x-mpeg",
- "mp2", "audio/x-mpeg",
- "mp3", "audio/x-mpeg",
+ "mp1", "audio/mpeg",
+ "mp2", "audio/mpeg",
+ "mp3", "audio/mpeg",
"mp4", "video/mp4",
- "mpa", "audio/x-mpeg",
+ "mpa", "audio/mpeg",
"mpe", "video/mpeg",
"mpeg", "video/mpeg",
"mpega", "audio/x-mpeg",
"mpg", "video/mpeg",
"mpv2", "video/mpeg2",
- "ms", "application/x-wais-source",
"nc", "application/x-netcdf",
"oda", "application/oda",
"odb", "application/vnd.oasis.opendocument.database",
@@ -831,7 +829,7 @@ public class Tomcat {
"oga", "audio/ogg",
"ogg", "audio/ogg",
"spx", "audio/ogg",
- "faca", "audio/flac",
+ "flac", "audio/flac",
"anx", "application/annodex",
"axa", "audio/annodex",
"axv", "video/annodex",
@@ -850,7 +848,7 @@ public class Tomcat {
"ppt", "application/vnd.ms-powerpoint",
"pps", "application/vnd.ms-powerpoint",
"ps", "application/postscript",
- "psd", "image/x-photoshop",
+ "psd", "image/vnd.adobe.photoshop",
"qt", "video/quicktime",
"qti", "image/x-quicktime",
"qtif", "image/x-quicktime",
@@ -858,13 +856,12 @@ public class Tomcat {
"rdf", "application/rdf+xml",
"rgb", "image/x-rgb",
"rm", "application/vnd.rn-realmedia",
- "roff", "application/x-troff",
+ "roff", "text/troff",
"rtf", "application/rtf",
"rtx", "text/richtext",
"sh", "application/x-sh",
"shar", "application/x-shar",
/*"shtml", "text/x-server-parsed-html",*/
- "smf", "audio/x-midi",
"sit", "application/x-stuffit",
"snd", "audio/basic",
"src", "application/x-wais-source",
@@ -873,7 +870,7 @@ public class Tomcat {
"svg", "image/svg+xml",
"svgz", "image/svg+xml",
"swf", "application/x-shockwave-flash",
- "t", "application/x-troff",
+ "t", "text/troff",
"tar", "application/x-tar",
"tcl", "application/x-tcl",
"tex", "application/x-tex",
@@ -881,7 +878,7 @@ public class Tomcat {
"texinfo", "application/x-texinfo",
"tif", "image/tiff",
"tiff", "image/tiff",
- "tr", "application/x-troff",
+ "tr", "text/troff",
"tsv", "text/tab-separated-values",
"txt", "text/plain",
"ulw", "audio/basic",
@@ -897,15 +894,15 @@ public class Tomcat {
"xslt", "application/xslt+xml",
"xul", "application/vnd.mozilla.xul+xml",
"xwd", "image/x-xwindowdump",
- "vsd", "application/x-visio",
+ "vsd", "application/vnd.visio",
"wav", "audio/x-wav",
"wbmp", "image/vnd.wap.wbmp",
"wml", "text/vnd.wap.wml",
"wmlc", "application/vnd.wap.wmlc",
- "wmls", "text/vnd.wap.wmlscript",
+ "wmls", "text/vnd.wap.wmlsc",
"wmlscriptc", "application/vnd.wap.wmlscriptc",
"wmv", "video/x-ms-wmv",
- "wrl", "x-world/x-vrml",
+ "wrl", "model/vrml",
"wspolicy", "application/wspolicy+xml",
"Z", "application/x-compress",
"z", "application/x-compress",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
