mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 10:36:38 -04:00
41 lines
1.8 KiB
Text
41 lines
1.8 KiB
Text
--- attachment.cgi.orig 2018-05-31 17:40:51 UTC
|
|
+++ attachment.cgi
|
|
@@ -25,8 +25,8 @@ use Bugzilla::Attachment;
|
|
use Bugzilla::Attachment::PatchReader;
|
|
use Bugzilla::Token;
|
|
|
|
-use Encode qw(encode find_encoding);
|
|
-use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}.
|
|
+use Encode qw(find_encoding);
|
|
+use URI::Escape qw(uri_escape_utf8);
|
|
|
|
# For most scripts we don't make $cgi and $template global variables. But
|
|
# when preparing Bugzilla for mod_perl, this script used these
|
|
@@ -341,11 +341,8 @@ sub view {
|
|
# escape quotes and backslashes in the filename, per RFCs 2045/822
|
|
$filename =~ s/\\/\\\\/g; # escape backslashes
|
|
$filename =~ s/"/\\"/g; # escape quotes
|
|
-
|
|
- # Avoid line wrapping done by Encode, which we don't need for HTTP
|
|
- # headers. See discussion in bug 328628 for details.
|
|
- local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 10000;
|
|
- $filename = encode('MIME-Q', $filename);
|
|
+ # Follow RFC 6266 section 4.1 (which itself points to RFC 5987 section 3.2)
|
|
+ $filename = uri_escape_utf8($filename);
|
|
|
|
my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment';
|
|
|
|
@@ -363,8 +360,11 @@ sub view {
|
|
}
|
|
}
|
|
}
|
|
- print $cgi->header(-type=>"$contenttype; name=\"$filename\"",
|
|
- -content_disposition=> "$disposition; filename=\"$filename\"",
|
|
+ # IE8 and older do not support RFC 6266. So for these old browsers
|
|
+ # we still pass the old 'filename' attribute. Modern browsers will
|
|
+ # automatically pick the new 'filename*' attribute.
|
|
+ print $cgi->header(-type=> $contenttype,
|
|
+ -content_disposition=> "$disposition; filename=\"$filename\"; filename*=UTF-8''$filename",
|
|
-content_length => $attachment->datasize);
|
|
disable_utf8();
|
|
print $attachment->data;
|