summaryrefslogtreecommitdiffstats
path: root/net/base/mime_util.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 22:43:19 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 22:43:19 +0000
commita56de4512ef52378aee3ce269ea30603cde58b57 (patch)
treedd91922caee821126ab6ef798182be27d9415563 /net/base/mime_util.cc
parentd7196e3474c92f1e85c32f98ad564a32604fa535 (diff)
downloadchromium_src-a56de4512ef52378aee3ce269ea30603cde58b57.zip
chromium_src-a56de4512ef52378aee3ce269ea30603cde58b57.tar.gz
chromium_src-a56de4512ef52378aee3ce269ea30603cde58b57.tar.bz2
Add mime types for application/pkcs7-mime and application/pkcs7-signature.
(Media types and file extensions from RFC 5751 Section 3.2.1.) BUG=70095 TEST=manual Review URL: http://codereview.chromium.org/7152003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util.cc')
-rw-r--r--net/base/mime_util.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 6c50354..05c04ca 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -118,7 +118,9 @@ static const MimeInfo secondary_mappings[] = {
{ "application/rdf+xml", "rdf" },
{ "text/xml", "xsl,xbl" },
{ "application/vnd.mozilla.xul+xml", "xul" },
- { "application/x-shockwave-flash", "swf,swl" }
+ { "application/x-shockwave-flash", "swf,swl" },
+ { "application/pkcs7-mime", "p7m,p7c,p7z" },
+ { "application/pkcs7-signature", "p7s" }
};
static const char* FindMimeType(const MimeInfo* mappings,