remove UTF8 warnings

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 4cdf5a19890ca72e3d96a80e71c45f304135edf7..cae46f9af0ff03ab7eb3d5898a9d98ca80d3defc 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -60,8 +60,8 @@ my %param = cgi_parameters(query => $q,
                          );
 # This is craptacular.
 
-my $ref = $param{bug} or quitcgi("No bug number");
-$ref =~ /(\d+)/ or quitcgi("Invalid bug number");
+my $ref = $param{bug} or quitcgi("No bug number", '400 Bad Request');
+$ref =~ /(\d+)/ or quitcgi("Invalid bug number", '400 Bad Request');
 $ref = $1;
 my $short = "#$ref";
 my ($msg) = $param{msg} =~ /^(\d+)$/ if exists $param{msg};
@@ -146,7 +146,12 @@ $etag =
                                 ],
                       );
 if (not $etag) {
-    print $q->header(-status => 304);
+    print $q->header(-status => 304,
+                    -cache_control => 'public, max-age=600',
+                    -etag => $etag,
+                    -charset => 'utf-8',
+                    -content_type => 'text/html',
+                   );
     print "304: Not modified\n";
     exit 0;
 }
@@ -156,6 +161,7 @@ if ($q->request_method() eq 'HEAD' and not defined($att) and not $mbox) {
     print $q->header(-status => 200,
                     -cache_control => 'public, max-age=600',
                     -etag => $etag,
+                    -charset => 'utf-8',
                     -content_type => 'text/html',
                    );
      exit 0;
@@ -220,7 +226,7 @@ if ( $mbox ) {
      binmode(STDOUT,":raw");
      my $date = strftime "%a %b %d %T %Y", localtime;
      if (@records > 1) {
-        print $q->header(-type => "text/plain",
+        print $q->header(-type => "application/mbox",
                          -cache_control => 'public, max-age=600',
                          -etag => $etag,
                          content_disposition => qq(attachment; filename="bug_${ref}.mbox"),
@@ -308,7 +314,7 @@ else {
         $msg_num++;
         ## allow this to be cached for a week
         print "Status: 200 OK\n";
-        print "Cache-control: public, max-age=604800\n";
+        print "Cache-Control: public, max-age=604800\n";
         print "Etag: $etag\n";
          print handle_email_message($records[0],
                                     ref => $ref,