Author: mattmann
Date: Sun Oct 18 19:20:59 2015
New Revision: 1709301

URL: http://svn.apache.org/viewvc?rev=1709301&view=rev
Log:
Fix for TIKA-1771 lower magic priority xhtml magic priority to ensure emails 
detected as message/rfc822 contributed by Jeremy B. Merrill 
<[email protected]> this closes #58.

Modified:
    tika/trunk/CHANGES.txt
    
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml

Modified: tika/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1709301&r1=1709300&r2=1709301&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Sun Oct 18 19:20:59 2015
@@ -1,5 +1,8 @@
 Release 1.11 - Current Development
 
+  * MIME magic improved to ensure emails detected as message/rfc822
+    (TIKA-1771).
+
   * Upgrade to Jackcess Encrypt 2.1.1 to avoid binary incompatibility
     with Bouncy Castle (TIKA-1736).
   

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=1709301&r1=1709300&r2=1709301&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 
Sun Oct 18 19:20:59 2015
@@ -3937,7 +3937,9 @@
   </mime-type>
 
   <mime-type type="application/xhtml+xml">
-    <magic priority="50">
+    <!-- The magic priority for xhtml+xml needs to be lower than that of -->
+    <!--  files that contain HTML within them, e.g. mime emails -->
+    <magic priority="40">
       <match value="&lt;html xmlns=" type="string" offset="0:8192"/>
     </magic>
     <root-XML namespaceURI="http://www.w3.org/1999/xhtml"; localName="html"/>


Reply via email to