Bug 622455: The attachment mime type autodetection shouldn't rely on the browser…

Bug 622455: The attachment mime type autodetection shouldn't rely on the browser when it gets text/x-* r=dkl a=glob

Bug 622455: The attachment mime type autodetection shouldn't rely on the browser…
737ffe4a · Frédéric Buclin · 27398a73 · 737ffe4a
Commit 737ffe4a authored Apr 29, 2015 by Frédéric Buclin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Attachment.pm Bugzilla/Attachment.pm +3 -5

No files found.
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -541,9 +541,8 @@ sub _check_content_type {
    # If we have autodetected application/octet-stream from the Content-Type
    # header, let's have a better go using a sniffer if available.
-    if (defined Bugzilla->input_params->{contenttypemethod}
+    if ((Bugzilla->input_params->{contenttypemethod} // '') eq 'autodetect'
-        && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
+        && ($content_type eq 'application/octet-stream' || $content_type =~ m{text/x-})
-        && $content_type eq 'application/octet-stream'
        && Bugzilla->feature('typesniffer'))
    {
        import File::MimeInfo::Magic qw(mimetype);
@@ -574,8 +573,7 @@ sub _check_content_type {
    # Make sure patches are viewable in the browser
    if (!ref($invocant)
-        && defined Bugzilla->input_params->{contenttypemethod}
+        && (Bugzilla->input_params->{contenttypemethod} // '') eq 'autodetect'
-        && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
        && $content_type =~ m{text/x-(?:diff|patch)})
    {
        $params->{ispatch} = 1;