Author: nick Date: Wed Feb 13 14:42:20 2013 New Revision: 1445629 URL: http://svn.apache.org/r1445629 Log: TIKA-1084 Merge image/x-icon (old) with the newer standard image/vnd.microsoft.icon
Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1445629&r1=1445628&r2=1445629&view=diff ============================================================================== --- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original) +++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Wed Feb 13 14:42:20 2013 @@ -3988,7 +3988,20 @@ <glob pattern="*.rlc"/> </mime-type> <mime-type type="image/vnd.globalgraphics.pgb"/> - <mime-type type="image/vnd.microsoft.icon"/> + + <mime-type type="image/vnd.microsoft.icon"> + <acronym>ICO</acronym> + <tika:link>http://en.wikipedia.org/wiki/.ico</tika:link> + <tika:uti>com.microsoft.ico</tika:uti> + <alias type="image/x-icon" /> + <magic priority="50"> + <match value="\102\101\050\000\000\000\056\000\000\000\000\000\000\000" + type="string" offset="0"/> + <match value="\000\000\001\000" type="string" offset="0"/> + </magic> + <glob pattern="*.ico"/> + </mime-type> + <mime-type type="image/vnd.mix"/> <mime-type type="image/vnd.ms-modi"> <glob pattern="*.mdi"/> @@ -4024,15 +4037,6 @@ <glob pattern="*.fh7"/> </mime-type> - <mime-type type="image/x-icon"> - <magic priority="50"> - <match value="\102\101\050\000\000\000\056\000\000\000\000\000\000\000" - type="string" offset="0"/> - <match value="\000\000\001\000" type="string" offset="0"/> - </magic> - <glob pattern="*.ico"/> - </mime-type> - <mime-type type="image/x-jp2-codestream"> <_comment>JPEG 2000 Codestream</_comment> <magic priority="25"> Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java?rev=1445629&r1=1445628&r2=1445629&view=diff ============================================================================== --- tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java (original) +++ tika/trunk/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java Wed Feb 13 14:42:20 2013 @@ -709,7 +709,9 @@ public class TikaDetectionTest extends T assertEquals("image/x-freehand", tika.detect("x.fh4")); assertEquals("image/x-freehand", tika.detect("x.fh5")); assertEquals("image/x-freehand", tika.detect("x.fh7")); - assertEquals("image/x-icon", tika.detect("x.ico")); + // Differ from httpd - An official mimetype has subsequently been issued + // favicon.ico +friends should now be image/vnd.microsoft.icon + //assertEquals("image/x-icon", tika.detect("x.ico")); assertEquals("image/x-pcx", tika.detect("x.pcx")); assertEquals("image/x-pict", tika.detect("x.pic")); assertEquals("image/x-pict", tika.detect("x.pct"));