You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2014/02/22 17:16:53 UTC
svn commit: r1570860 - in /tika/trunk:
tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Author: nick
Date: Sat Feb 22 16:16:52 2014
New Revision: 1570860
URL: http://svn.apache.org/r1570860
Log:
TIKA-1241 Mime Magic for empty and spanned zip files, plus spanned zip file detection unit test
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.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=1570860&r1=1570859&r2=1570860&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 Sat Feb 22 16:16:52 2014
@@ -3437,6 +3437,8 @@
<alias type="application/x-zip-compressed"/>
<magic priority="40">
<match value="PK\003\004" type="string" offset="0"/>
+ <match value="PK\005\006" type="string" offset="0"/>
+ <match value="PK\x07\x08" type="string" offset="0"/>
</magic>
<glob pattern="*.zip"/>
</mime-type>
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1570860&r1=1570859&r2=1570860&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java Sat Feb 22 16:16:52 2014
@@ -299,6 +299,10 @@ public class TestMimeTypes {
assertTypeByData("application/x-gtar", "test-documents.tar"); // GNU TAR
assertTypeByData("application/x-gzip", "test-documents.tgz"); // See GZIP, not tar contents of it
assertTypeByData("application/x-cpio", "test-documents.cpio");
+
+ // For spanned zip files, the .zip file doesn't have the header, it's the other parts
+ assertTypeByData("application/octet-stream", "test-documents-spanned.zip");
+ assertTypeByData("application/zip", "test-documents-spanned.z01");
}
@Test