In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/3d4382850300c498d5f4a81fdec29a4a557840bd?hp=aae7e7b3d1e34c8713fc4867e92c9ef0fd0ecb95>
- Log ----------------------------------------------------------------- commit 3d4382850300c498d5f4a81fdec29a4a557840bd Merge: 86247f3... aae7e7b... Author: Steve Peters <[email protected]> Date: Wed Mar 25 07:32:12 2009 -0500 Merge branch 'blead' of ssh://[email protected]/gitroot/perl into blead commit 86247f3d607ecfd3df0af4adc5c04a1407f6f61b Author: Steve Peters <[email protected]> Date: Wed Mar 25 07:26:01 2009 -0500 Upgrade to Encode-2.33. M ext/Encode/Changes M ext/Encode/Encode.pm M ext/Encode/lib/Encode/MIME/Header.pm ----------------------------------------------------------------------- Summary of changes: ext/Encode/Changes | 11 +++++++++-- ext/Encode/Encode.pm | 4 ++-- ext/Encode/lib/Encode/MIME/Header.pm | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ext/Encode/Changes b/ext/Encode/Changes index 6c68166..5c68f48 100644 --- a/ext/Encode/Changes +++ b/ext/Encode/Changes @@ -1,8 +1,15 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.32 2009/03/07 07:32:37 dankogai Exp dankogai $ +# $Id: Changes,v 2.33 2009/03/25 07:55:57 dankogai Exp dankogai $ # -$Revision: 2.32 $ $Date: 2009/03/07 07:32:37 $ +$Revision: 2.33 $ $Date: 2009/03/25 07:55:57 $ +! lib/Encode/MIME/Header.pm + Decontaminated $& which sneaked in on 2.31. + <67fc9f3a39c746da95aab6bb01539...@robmhp> + <[email protected]> + http://coderepos.org/share/changeset/31542 + +2.32 2009/03/07 07:32:37 ! lib/Encode/Alias.pm t/Alias.t Encode now resolves 'en_US.UTF-8' to utf-8-strict like 'ja_JP.euc' Those who set locale on their shells should be happier now. diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm index ffaf9b8..c6ba72f 100644 --- a/ext/Encode/Encode.pm +++ b/ext/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.32 2009/03/07 07:32:37 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.33 2009/03/25 07:53:19 dankogai Exp $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.32 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.33 $ =~ /(\d+)/g; sub DEBUG () { 0 } use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/ext/Encode/lib/Encode/MIME/Header.pm b/ext/Encode/lib/Encode/MIME/Header.pm index 624bf17..aba5b3b 100644 --- a/ext/Encode/lib/Encode/MIME/Header.pm +++ b/ext/Encode/lib/Encode/MIME/Header.pm @@ -3,7 +3,7 @@ use strict; use warnings; no warnings 'redefine'; -our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = do { my @r = ( q$Revision: 2.10 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use Encode qw(find_encoding encode_utf8 decode_utf8); use MIME::Base64; use Carp; @@ -175,9 +175,9 @@ sub _encode_q { my $chunk = shift; $chunk = encode_utf8($chunk); $chunk =~ s{ - [^0-9A-Za-z] + ([^0-9A-Za-z]) }{ - join("" => map {sprintf "=%02X", $_} unpack("C*", $&)) + join("" => map {sprintf "=%02X", $_} unpack("C*", $1)) }egox; return HEAD . 'Q?' . $chunk . TAIL; } -- Perl5 Master Repository
