From: kiko%async.com.br <>
Date: Wed, 29 Oct 2003 09:58:13 +0000 (+0000)
Subject: Fix for bug 111522: Provide ability to specify MIME type of attachment
X-Git-Tag: bugzilla-2.17.5~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376c76bd00d1eefd68c1013bf43cb6cbb3be653b;p=thirdparty%2Fbugzilla.git

Fix for bug 111522: Provide ability to specify MIME type of attachment
when downloading. Adds a 'ctype' argument to attachment.cgi which allows
one to override the content-type when viewing an attachment. Original
patch by Alex Vincent <ajvincent@juno.com>; I changed it a tiny bit.
r=kiko, myk. a=justdave.
---

diff --git a/attachment.cgi b/attachment.cgi
index d020b4f57c..1f855d367a 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -22,6 +22,7 @@
 #                 Myk Melez <myk@mozilla.org>
 #                 Daniel Raichle <draichle@gmx.net>
 #                 Dave Miller <justdave@syndicomm.com>
+#                 Alexander J. Vincent <ajvincent@juno.com>
 
 ################################################################################
 # Script Initialization
@@ -433,6 +434,15 @@ sub view
     # Retrieve the attachment content and its content type from the database.
     SendSQL("SELECT mimetype, filename, thedata FROM attachments WHERE attach_id = $::FORM{'id'}");
     my ($contenttype, $filename, $thedata) = FetchSQLData();
+   
+    # Bug 111522: allow overriding content-type manually in the posted $::FORM.
+    if ($::FORM{'ctype'})
+    {
+        $::FORM{'contenttypemethod'} = 'manual';
+        $::FORM{'contenttypeentry'} = $::FORM{'ctype'};
+        validateContentType();
+        $contenttype = $::FORM{'ctype'};
+    }
 
     # Return the appropriate HTTP response headers.
     $filename =~ s/^.*[\/\\]//;