vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 53764 

A hack for buggy Encode::MIME::Header


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@382 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2009-09-04 17:40:06 +00:00
parent 892e4dcf68
commit 778cdb1678
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Bugzilla.pm
View File

@ -54,6 +54,7 @@ use File::Basename;
use File::Spec::Functions;
use DateTime::TimeZone;
use Safe;
use Encode::MIME::Header ();
# This creates the request cache for non-mod_perl installations.
our $_request_cache = {};
@ -74,6 +75,62 @@ use constant SHUTDOWNHTML_EXIT_SILENTLY => [
'whine.pl'
];
#####################################################################
# Hack into buggy Encode::MIME::Header
#####################################################################
{ # Block taken directly from Encode::MIME::Header v2.11
my $especials =
join( '|' => map { quotemeta( chr($_) ) }
unpack( "C*", qq{()<>@,;:"'/[]?.=} ) );
my $re_encoded_word = qr{
=\? # begin encoded word
(?:[-0-9A-Za-z_]+) # charset (encoding)
(?:\*[A-Za-z]{1,8}(?:-[A-Za-z]{1,8})*)? # language (RFC 2231)
\?(?:[QqBb])\? # delimiter
(?:.*?) # Base64-encodede contents
\?= # end encoded word
}xo;
# And changed only here: <<<
my $re_especials = qr{$re_encoded_word}xo;
# >>>
*Encode::MIME::Header::encode = sub($$;$) {
my ( $obj, $str, $chk ) = @_;
my @line = ();
for my $line ( split /\r\n|[\r\n]/o, $str ) {
my ( @word, @subline );
for my $word ( split /($re_especials)/o, $line ) {
if ( $word =~ /[^\x00-\x7f]/o
or $word =~ /^$re_encoded_word$/o )
{
push @word, $obj->_encode($word);
}
else {
push @word, $word;
}
}
my $subline = '';
for my $word (@word) {
use bytes ();
if ( bytes::length($subline) + bytes::length($word) >
$obj->{bpl} )
{
push @subline, $subline;
$subline = '';
}
$subline .= $word;
}
$subline and push @subline, $subline;
push @line, join( "\n " => @subline );
}
$_[1] = '' if $chk;
return join( "\n", @line );
}
}
#####################################################################
# Global Code
#####################################################################