From ba40575b1bc253505539e6f1f4c3f07c32cc09e5 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Wed, 12 Mar 2008 17:43:53 -0400 Subject: [PATCH 1/1] "646" Message-ID: <47D886D9.6060001@iki.fi> Encode::Alias fix for encoding "646" (aka ASCII) on Solaris p4raw-id: //depot/perl@33562 --- ext/Encode/lib/Encode/Alias.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm index 403293b..5ab72b9 100644 --- a/ext/Encode/lib/Encode/Alias.pm +++ b/ext/Encode/lib/Encode/Alias.pm @@ -2,7 +2,7 @@ package Encode::Alias; use strict; use warnings; no warnings 'redefine'; -our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = '2.8_01';# do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; sub DEBUG () { 0 } use base qw(Exporter); @@ -151,7 +151,7 @@ sub init_aliases { # ASCII define_alias( qr/^(?:US-?)ascii$/i => '"ascii"' ); define_alias( 'C' => 'ascii' ); - define_alias( qr/\bISO[-_]?646[-_]?US$/i => '"ascii"' ); + define_alias( qr/\b(?:ISO[-_]?)?646(?:[-_]?US)?$/i => '"ascii"' ); # Allow variants of iso-8859-1 etc. define_alias( qr/\biso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' ); -- 1.8.3.1