From: Steve Peters <steve@fisharerojo.org>
Date: Wed, 25 Mar 2009 12:26:01 +0000 (-0500)
Subject: Upgrade to Encode-2.33.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=86247f3d607ecfd3df0af4adc5c04a1407f6f61b;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to Encode-2.33.
---

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.
+  <67FC9F3A39C746DA95AAB6BB01539099@robmhp>
+  <693254b90903242352x2dc26ba6p5e68deb871fa88ae@mail.gmail.com>
+  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;
 }