Bug 575097 - "New STS header in Bugzilla::CGI causes malformed header error due to lack of Content-Type naming"

[r=LpSolit a=LpSolit]

1 files changed, 6 insertions, 5 deletions

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 30f88bd5b..12bbc5f00 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -275,13 +275,14 @@ sub multipart_start {
 sub header {
     my $self = shift;
 
+    # If there's only one parameter, then it's a Content-Type.
+    if (scalar(@_) == 1) {
+        # Since we're adding parameters below, we have to name it.
+        unshift(@_, '-type' => shift(@_));
+    }
+
     # Add the cookies in if we have any
     if (scalar(@{$self->{Bugzilla_cookie_list}})) {
-        if (scalar(@_) == 1) {
-            # if there's only one parameter, then it's a Content-Type.
-            # Since we're adding parameters we have to name it.
-            unshift(@_, '-type' => shift(@_));
-        }
         unshift(@_, '-cookie' => $self->{Bugzilla_cookie_list});
     }