Changeset 30106

Timestamp:

02/16/09 02:41:21 (4 years ago)

Author:

dankogai

Message:

drry, // is NOT SUPPORTED before perl 5.10!

Location:

lang/perl/Encode/trunk

Files:

• Changes (modified) (1 diff)
• lib/Encode/MIME/Header.pm (modified) (3 diffs)

lang/perl/Encode/trunk/Changes

@@ -4 +4 @@
 #
 $Revision: 2.29 $ $Date: 2009/02/01 13:14:37 $
+! lib/Encode/MIME/Header.pm
+  Addressed: Encode::MIME::Header::decode should respect CHECK
+  http://rt.cpan.org/Ticket/Display.html?id=43204
+
+2.29 2009/02/01 13:14:37
 ! Encode.pm
   VERSION++ just to make PAUSE happy

lang/perl/Encode/trunk/lib/Encode/MIME/Header.pm

@@ -62 +62 @@
         if      (uc($2) eq 'B'){
             $obj->{decode_b} or croak qq(MIME "B" unsupported);
-            decode_b($1, $3);
+            decode_b($1, $3, $chk);
         } elsif (uc($2) eq 'Q'){
             $obj->{decode_q} or croak qq(MIME "Q" unsupported);
-            decode_q($1, $3);
+            decode_q($1, $3, $chk);
         } else {
             croak qq(MIME "$2" encoding is nonexistent!);
         }
     }egox;
-    $_[1] = '' if $chk;
+    $_[1] = $str if $chk;
     return $str;
 }
@@ -78 +78 @@
     my $d    = find_encoding($enc) or croak qq(Unknown encoding "$enc");
     my $db64 = decode_base64(shift);
+    my $chk  = shift;
     return $d->name eq 'utf8'
       ? Encode::decode_utf8($db64)
-      : $d->decode( $db64, Encode::FB_PERLQQ );
+      : $d->decode( $db64, $chk || Encode::FB_PERLQQ );
 }
 
 sub decode_q {
-    my ( $enc, $q ) = @_;
+    my ( $enc, $q, $chk ) = @_;
     my $d = find_encoding($enc) or croak qq(Unknown encoding "$enc");
     $q =~ s/_/ /go;
@@ -90 +91 @@
     return $d->name eq 'utf8'
       ? Encode::decode_utf8($q)
-      : $d->decode( $q, Encode::FB_PERLQQ );
+      : $d->decode( $q, $chk || Encode::FB_PERLQQ );
 }