back out fix for bug 243833 since it caused regressions
authorDavid Bienvenu <bienvenu@nventure.com>
Fri, 06 May 2011 08:09:53 -0700
changeset 7713 165a011f1c2acc8152862a7b7cd13fde6429b768
parent 7712 8e1da10cd1117901aefbac067cf411f44cb6d324
child 7714 d538b947880cd3cfb8b51fb6c36aade2c8053b0b
push idunknown
push userunknown
push dateunknown
bugs243833
back out fix for bug 243833 since it caused regressions
mail/test/mozmill/attachment/test-attachment.js
mailnews/mime/src/mimei.cpp
--- a/mail/test/mozmill/attachment/test-attachment.js
+++ b/mail/test/mozmill/attachment/test-attachment.js
@@ -92,23 +92,16 @@ var setupModule = function (module) {
     { attachments: [{ body: textAttachment,
                       filename: 'ubik.txt',
                       format: '' },
                     { body: binaryAttachment,
                       contentType: 'application/octet-stream',
                       filename: 'ubik.xxyyzz',
                       format: '' }],
     },
-    // cert attachment (make sure Mime doesn't swallow this, which
-    // test_attachment_view_expanded does for us.
-    { attachments: [{ body: binaryAttachment,
-                      contentType: 'application/pkcs7-mime',
-                      filename: 'cert.p7m',
-                      format: '' }],
-    },
   ];
 
   for (let i = 0; i < messages.length; i++)
     add_message_to_folder(folder, create_message(messages[i]));
 };
 
 function test_attachment_view_collapsed() {
   be_in_folder(folder);
--- a/mailnews/mime/src/mimei.cpp
+++ b/mailnews/mime/src/mimei.cpp
@@ -760,18 +760,17 @@ mime_find_class (const char *content_typ
           clazz = (MimeObjectClass *)&mimeExternalObjectClass;
         else {
           /* look at the file extension... less reliable, but still covered
              by the S/MIME specification (RFC 3851, section 3.2.1)  */
           char *name = (hdrs ? MimeHeaders_get_name(hdrs, opts) : nsnull);
           if (name) {
             char *suf = PL_strrchr(name, '.');
             if (suf &&
-                (!PL_strcasecmp(suf, ".p7c") || !PL_strcasecmp(suf, ".p7z") ||
-                 !PL_strcasecmp(suf, ".p7m")))
+                (!PL_strcasecmp(suf, ".p7c") || !PL_strcasecmp(suf, ".p7z")))
               clazz = (MimeObjectClass *)&mimeExternalObjectClass;
           }
           PR_Free(name);
         }
         PR_Free(st);
         PR_Free(ct);
     }
 #endif