diff options
| -rw-r--r-- | MANIFEST | 2 | ||||
| -rw-r--r-- | ext/Encode/AUTHORS | 28 | ||||
| -rw-r--r-- | ext/Encode/Changes | 24 | ||||
| -rw-r--r-- | ext/Encode/Encode.pm | 6 | ||||
| -rw-r--r-- | ext/Encode/Encode.xs | 13 | ||||
| -rw-r--r-- | ext/Encode/Encode/encode.h | 1 | ||||
| -rw-r--r-- | ext/Encode/MANIFEST | 2 | ||||
| -rw-r--r-- | ext/Encode/META.yml | 2 | ||||
| -rw-r--r-- | ext/Encode/lib/Encode/Alias.pm | 2 | ||||
| -rw-r--r-- | ext/Encode/lib/Encode/Config.pm | 3 | ||||
| -rw-r--r-- | ext/Encode/lib/Encode/MIME/Header.pm | 6 | ||||
| -rw-r--r-- | ext/PerlIO/encoding/encoding.pm | 5 |
12 files changed, 69 insertions, 25 deletions
@@ -428,6 +428,7 @@ ext/Encode/lib/Encode/JP/H2Z.pm Encode extension ext/Encode/lib/Encode/JP/JIS7.pm Encode extension ext/Encode/lib/Encode/KR/2022_KR.pm Encode extension ext/Encode/lib/Encode/MIME/Header.pm Encode extension +ext/Encode/lib/Encode/MIME/Header/ISO_2022_JP.pm Encode extension ext/Encode/lib/Encode/PerlIO.pod Documents for Encode & PerlIO ext/Encode/lib/Encode/Supported.pod Documents for supported encodings ext/Encode/lib/Encode/Unicode/UTF7.pm Encode extension @@ -469,6 +470,7 @@ ext/Encode/t/jperl.t test script ext/Encode/t/ksc5601.enc test data ext/Encode/t/ksc5601.utf test data ext/Encode/t/mime-header.t test script +ext/Encode/t/mime_header_iso2022jp.t test script ext/Encode/t/Mod_EUCJP.pm module that t/enc_module.enc uses ext/Encode/t/perlio.t test script ext/Encode/t/rt.pl test script diff --git a/ext/Encode/AUTHORS b/ext/Encode/AUTHORS index 42e2febfc0..a42e4d677c 100644 --- a/ext/Encode/AUTHORS +++ b/ext/Encode/AUTHORS @@ -12,43 +12,47 @@ Andreas J. Koenig <andreas.koenig@anima.de> Anton Tagunov <tagunov@motor.ru> Autrijus Tang <autrijus@autrijus.org> -Benjamin Goldberg <goldbb2@earthlink.net> +Benjamin Goldberg <goldbb2@earthlink.net> Bjoern Hoehrmann <derhoermi@gmx.net> Bjoern Jacke <debianbugs@j3e.de> -Chris Nandor <pudge@pobox.com> +Chris Nandor <pudge@pobox.com> Craig A. Berry <craigberry@mac.com> Dan Kogai <dankogai@dan.co.jp> Dave Evans <dave@rudolf.org.uk> Deng Liu <dengliu@ntu.edu.tw> Dominic Dunlop <domo@computer.org> -Elizabeth Mattijsen <liz@dijkmat.nl> +Elizabeth Mattijsen <liz@dijkmat.nl> Gerrit P. Haase <gp@familiehaase.de> -Graham Barr <gbarr@pobox.com> +Graham Barr <gbarr@pobox.com> Gurusamy Sarathy <gsar@activestate.com> -H.Merijn Brand <h.m.brand@hccnet.nl> +H.Merijn Brand <h.m.brand@xs4all.nl> Hugo van der Sanden <hv@crypt.org> Inaba Hiroto <inaba@st.rim.or.jp> Jarkko Hietaniemi <jhi@iki.fi> -Jungshik Shin <jshin@mailaps.org> +Jungshik Shin <jshin@mailaps.org> +KONNO Hiroharu <hiroharu.konno@bowneglobal.co.jp> Laszlo Molnar <ml1050@freemail.hu> MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp> -Mark-Jason Dominus <mjd@plover.com> +Makamaka <makamaka@donzoko.net> +Mark-Jason Dominus <mjd@plover.com> Mattia Barbon <mbarbon@dsi.unive.it> -Michael G Schwern <schwern@pobox.com> +Michael G Schwern <schwern@pobox.com> +Miron Cuperman <miron@hyper.to> Nicholas Clark <nick@ccl4.org> Nick Ing-Simmons <nick@ing-simmons.net> -Paul Marquess <paul_marquess@yahoo.co.uk> +Paul Marquess <paul_marquess@yahoo.co.uk> Peter Prymmer <pvhp@best.com> Philip Newton <pne@cpan.org> -Robin Barker <rmb1@cise.npl.co.uk> +Piotr Fusik <pfusik@op.pl> +Robin Barker <rmb1@cise.npl.co.uk> SADAHIRO Tomoyuki <SADAHIRO@cpan.org> SUGAWARA Hajime <sugawara@hdt.co.jp> -SUZUKI Norio <ZAP00217@nifty.com> +SUZUKI Norio <ZAP00217@nifty.com> Simon Cozens <simon@netthink.co.uk> Spider Boardman <spider@web.zk3.dec.com> Steve Hay <steve.hay@uk.radan.com> Steve Peters <steve@fisharerojo.org> Tatsuhiko Miyagawa <miyagawa@edge.co.jp> -Tels <perl_dummy@bloodgate.com> +Tels <perl_dummy@bloodgate.com> Vadim Konovalov <vkonovalov@peterstar.ru> Yitzchak Scott-Thoennes <sthoenna@efn.org> diff --git a/ext/Encode/Changes b/ext/Encode/Changes index 16d6ed2782..dd9a6b5bed 100644 --- a/ext/Encode/Changes +++ b/ext/Encode/Changes @@ -1,8 +1,28 @@ # Revision history for Perl extension Encode. # -# $Id: Changes,v 2.10 2005/05/16 18:46:36 dankogai Exp dankogai $ +# $Id: Changes,v 2.11 2005/08/05 10:58:25 dankogai Exp dankogai $ # -$Revision: 2.10 $ $Date: 2005/05/16 18:46:36 $ +$Revision: 2.11 $ $Date: 2005/08/05 10:58:25 $ +! AUTHORS CHANGES + To reflect changes below +! Encode.pm encoding.pm + lib/Encode/Alias.pm lib/Encode/PerlIO.pod lib/Encode/Supported.pod + Typo fixed by Piotr Fusik in Change 25261 & 25266 + Message-ID: <001401c595bd$dccb5d80$0bd34dd5@piec> +! Encode.xs + Addresses "BUG REPORT: panic in Encode.xs". + Message-Id: <42EDDA97.2010608@hyper.to> ++ lib/Encode/MIME/Header/ISO_2022_JP.pm mime_header_iso2022jp.t +! lib/Encode/MIME/Header.pm lib/Encode/Config.pm + Encoding 'MIME-Header-ISO_2022_JP' is introduced by Makamaka + Message-Id: <200507311557.j6VFvE2K034605@www231.sakura.ne.jp> +! Encode/encode.h Encode.pm Encode.xs + PerlIO's "encoding(utf-8-strict)" got a problem w/ partial character. + Found and addressed by KONNO Hiroharu <hiroharu.konno@bowneglobal.co.jp> + See also ext/PerlIO/encoding/encoding.pm + Message-Id: <E1DineE-00068X-TB@yok-gs-workman.asia.bgsinternal.com> + +2.10 2005/05/16 18:46:36 ! Encode.pm fixed decode_utf8() accordingly to RT#8872 http://rt.cpan.org/NoAuth/Bug.html?id=8872 diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm index 672ab4b566..9b45b7b120 100644 --- a/ext/Encode/Encode.pm +++ b/ext/Encode/Encode.pm @@ -1,9 +1,9 @@ # -# $Id: Encode.pm,v 2.10 2005/05/16 18:46:36 dankogai Exp dankogai $ +# $Id: Encode.pm,v 2.11 2005/08/05 10:58:25 dankogai Exp dankogai $ # package Encode; use strict; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.10 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.11 $ =~ /(\d+)/g; sub DEBUG () { 0 } use XSLoader (); XSLoader::load(__PACKAGE__, $VERSION); @@ -19,7 +19,7 @@ our @EXPORT = qw( ); our @FB_FLAGS = qw(DIE_ON_ERR WARN_ON_ERR RETURN_ON_ERR LEAVE_SRC - PERLQQ HTMLCREF XMLCREF); + PERLQQ HTMLCREF XMLCREF STOP_AT_PARTIAL); our @FB_CONSTS = qw(FB_DEFAULT FB_CROAK FB_QUIET FB_WARN FB_PERLQQ FB_HTMLCREF FB_XMLCREF); diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs index 689100b1e1..cc5fe3b25b 100644 --- a/ext/Encode/Encode.xs +++ b/ext/Encode/Encode.xs @@ -1,5 +1,5 @@ /* - $Id: Encode.xs,v 2.4 2005/05/16 18:46:36 dankogai Exp dankogai $ + $Id: Encode.xs,v 2.5 2005/08/05 10:58:25 dankogai Exp dankogai $ */ #define PERL_NO_GET_CONTEXT @@ -151,6 +151,8 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src, UV ch = utf8n_to_uvuni(s+slen, (SvCUR(src)-slen), &clen, UTF8_ALLOW_ANY|UTF8_CHECK_ONLY); + /* if non-representable multibyte prefix at end of current buffer - break*/ + if (clen > tlen - sdone) break; if (check & ENCODE_DIE_ON_ERR) { Perl_croak(aTHX_ ERR_ENCODE_NOMAP, (UV)ch, enc->name[0]); @@ -290,7 +292,7 @@ process_utf8(pTHX_ SV* dst, U8* s, U8* e, int check, if ((s + skip) > e) { /* Partial character */ /* XXX could check that rest of bytes are UTF8_IS_CONTINUATION(ch) */ - if (stop_at_partial) + if (stop_at_partial || (check & ENCODE_STOP_AT_PARTIAL)) break; goto malformed_byte; @@ -791,6 +793,13 @@ OUTPUT: RETVAL int +STOP_AT_PARTIAL() +CODE: + RETVAL = ENCODE_STOP_AT_PARTIAL; +OUTPUT: + RETVAL + +int FB_DEFAULT() CODE: RETVAL = ENCODE_FB_DEFAULT; diff --git a/ext/Encode/Encode/encode.h b/ext/Encode/Encode/encode.h index d7a57a40e6..94764a6a14 100644 --- a/ext/Encode/Encode/encode.h +++ b/ext/Encode/Encode/encode.h @@ -98,6 +98,7 @@ extern void Encode_DefineEncoding(encode_t *enc); #define ENCODE_PERLQQ 0x0100 /* perlqq fallback string */ #define ENCODE_HTMLCREF 0x0200 /* HTML character ref. fb mode */ #define ENCODE_XMLCREF 0x0400 /* XML character ref. fb mode */ +#define ENCODE_STOP_AT_PARTIAL 0x0800 /* stop at partial explicitly */ #define ENCODE_FB_DEFAULT 0x0000 #define ENCODE_FB_CROAK 0x0001 diff --git a/ext/Encode/MANIFEST b/ext/Encode/MANIFEST index 7f31c3c045..35aefddee8 100644 --- a/ext/Encode/MANIFEST +++ b/ext/Encode/MANIFEST @@ -49,6 +49,7 @@ lib/Encode/JP/H2Z.pm Encode extension lib/Encode/JP/JIS7.pm Encode extension lib/Encode/KR/2022_KR.pm Encode extension lib/Encode/MIME/Header.pm Encode extension +lib/Encode/MIME/Header/ISO_2022_JP.pm Encode extension lib/Encode/PerlIO.pod Documents for Encode & PerlIO lib/Encode/Supported.pod Documents for supported encodings lib/Encode/Unicode/UTF7.pm Encode Extension @@ -86,6 +87,7 @@ t/jperl.t test script t/ksc5601.enc test data t/ksc5601.utf test data t/mime-header.t test script +t/mime_header_iso2022jp.t test script t/perlio.t test script t/rt.pl even more test script t/unibench.pl benchmark script diff --git a/ext/Encode/META.yml b/ext/Encode/META.yml index d1a3260ece..e17c3de122 100644 --- a/ext/Encode/META.yml +++ b/ext/Encode/META.yml @@ -1,7 +1,7 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: Encode -version: 2.10 +version: 2.11 version_from: Encode.pm installdirs: perl requires: diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm index 2ec8f9f088..c0bbf69f46 100644 --- a/ext/Encode/lib/Encode/Alias.pm +++ b/ext/Encode/lib/Encode/Alias.pm @@ -2,7 +2,7 @@ package Encode::Alias; use strict; no warnings 'redefine'; use Encode; -our $VERSION = do { my @r = (q$Revision: 2.3 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +our $VERSION = do { my @r = (q$Revision: 2.4 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; sub DEBUG () { 0 } use base qw(Exporter); diff --git a/ext/Encode/lib/Encode/Config.pm b/ext/Encode/lib/Encode/Config.pm index 0c752cf858..d69b92d824 100644 --- a/ext/Encode/lib/Encode/Config.pm +++ b/ext/Encode/lib/Encode/Config.pm @@ -2,7 +2,7 @@ # Demand-load module list # package Encode::Config; -our $VERSION = do { my @r = (q$Revision: 2.0 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +our $VERSION = do { my @r = (q$Revision: 2.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; use strict; @@ -145,6 +145,7 @@ unless (ord("A") == 193){ 'MIME-B' => 'Encode::MIME::Header', 'MIME-Q' => 'Encode::MIME::Header', + 'MIME-Header-ISO_2022_JP' => 'Encode::MIME::Header::ISO_2022_JP', ); } diff --git a/ext/Encode/lib/Encode/MIME/Header.pm b/ext/Encode/lib/Encode/MIME/Header.pm index f000776620..f4e2ad6e2b 100644 --- a/ext/Encode/lib/Encode/MIME/Header.pm +++ b/ext/Encode/lib/Encode/MIME/Header.pm @@ -1,7 +1,7 @@ package Encode::MIME::Header; use strict; # use warnings; -our $VERSION = do { my @r = (q$Revision: 2.0 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +our $VERSION = do { my @r = (q$Revision: 2.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; use Encode qw(find_encoding encode_utf8 decode_utf8); use MIME::Base64; use Carp; @@ -216,6 +216,10 @@ and =?ISO-8859-1?= but that makes the implementation too complicated. These days major mail agents all support =?UTF-8? so I think it is just good enough. +Due to popular demand, 'MIME-Header-ISO_2022_JP' was introduced by +Makamaka. Thre are still too many MUAs especially cellular phone +handsets which does not grok UTF-8. + =head1 SEE ALSO L<Encode> diff --git a/ext/PerlIO/encoding/encoding.pm b/ext/PerlIO/encoding/encoding.pm index 3eb7dd589f..f0d419beed 100644 --- a/ext/PerlIO/encoding/encoding.pm +++ b/ext/PerlIO/encoding/encoding.pm @@ -1,6 +1,6 @@ package PerlIO::encoding; use strict; -our $VERSION = '0.08'; +our $VERSION = '0.09'; our $DEBUG = 0; $DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n"; @@ -12,7 +12,8 @@ $DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n"; use XSLoader (); XSLoader::load(__PACKAGE__, $VERSION); -our $fallback = Encode::PERLQQ()|Encode::WARN_ON_ERR(); +our $fallback = + Encode::PERLQQ()|Encode::WARN_ON_ERR()|Encode::STOP_AT_PARTIAL(); 1; __END__ |