r47094 - in /branches/upstream/libemail-mime-perl/current: Changes META.yml lib/Email/MIME.pm lib/Email/MIME/Creator.pm lib/Email/MIME/Header.pm lib/Email/MIME/Modifier.pm

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Fri Nov 13 03:51:21 2009
New Revision: 47094

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47094
Log:
[svn-upgrade] Integrating new upstream version, libemail-mime-perl (1.902)

Modified:
    branches/upstream/libemail-mime-perl/current/Changes
    branches/upstream/libemail-mime-perl/current/META.yml
    branches/upstream/libemail-mime-perl/current/lib/Email/MIME.pm
    branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Creator.pm
    branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Header.pm
    branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Modifier.pm

Modified: branches/upstream/libemail-mime-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/Changes?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/Changes (original)
+++ branches/upstream/libemail-mime-perl/current/Changes Fri Nov 13 03:51:21 2009
@@ -1,4 +1,8 @@
 Revision history for Perl extension Email::MIME.
+
+1.902   2009-11-11
+        allow for padding spaces in the Content-Transfer-Encoding header
+        (Geraint Edwards)
 
 1.901   2009-11-05
         bump up Email::MIME::Encodings version required

Modified: branches/upstream/libemail-mime-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/META.yml?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/META.yml (original)
+++ branches/upstream/libemail-mime-perl/current/META.yml Fri Nov 13 03:51:21 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Email-MIME
-version:            1.901
+version:            1.902
 abstract:           ~
 author:  []
 license:            perl

Modified: branches/upstream/libemail-mime-perl/current/lib/Email/MIME.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/lib/Email/MIME.pm?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/lib/Email/MIME.pm (original)
+++ branches/upstream/libemail-mime-perl/current/lib/Email/MIME.pm Fri Nov 13 03:51:21 2009
@@ -21,7 +21,7 @@
 
 =head1 VERSION
 
-version 1.901
+version 1.902
 
 =head1 SYNOPSIS
 
@@ -111,7 +111,7 @@
 
 =cut
 
-our $VERSION = '1.901';
+our $VERSION = '1.902';
 
 use vars qw[$CREATOR];
 $CREATOR = 'Email::MIME::Creator';
@@ -288,16 +288,19 @@
 sub body {
   my $self = shift;
   my $body = $self->SUPER::body;
-  my $cte  = $self->header("Content-Transfer-Encoding");
+  my $cte  = $self->header("Content-Transfer-Encoding") || '';
+  
+  $cte =~ s/\A\s+//;
+  $cte =~ s/\s+\z//;
+  $cte =~ s/;.+//; # For S/MIME, etc.
+
   return $body unless $cte;
-  if (!$self->force_decode_hook and $cte =~ /^7bit|8bit|binary/i) {
+
+  if (!$self->force_decode_hook and $cte =~ /\A(?:7bit|8bit|binary)\z/i) {
     return $body;
   }
 
   $body = $self->decode_hook($body) if $self->can("decode_hook");
-
-  # For S/MIME, etc.
-  $cte =~ s/;.+//;
 
   $body = Email::MIME::Encodings::decode($cte, $body);
   return $body;
@@ -547,7 +550,7 @@
   # object. -- rjbs, 2007-07-16
   unless (((caller(1))[3] || '') eq 'Email::Simple::new') {
     $body = Email::MIME::Encodings::encode($enc, $body)
-      unless !$enc || $enc =~ /^(?:7bit|8bit|binary)$/i;
+      unless !$enc || $enc =~ /^(?:7bit|8bit|binary)\s*$/i;
   }
 
   $self->{body_raw} = $body;

Modified: branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Creator.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Creator.pm?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Creator.pm (original)
+++ branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Creator.pm Fri Nov 13 03:51:21 2009
@@ -2,7 +2,7 @@
 use strict;
 
 use vars qw[$VERSION];
-$VERSION = '1.901';
+$VERSION = '1.902';
 
 use base q[Email::Simple::Creator];
 use Email::MIME;

Modified: branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Header.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Header.pm?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Header.pm (original)
+++ branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Header.pm Fri Nov 13 03:51:21 2009
@@ -3,7 +3,7 @@
 package Email::MIME::Header;
 use base 'Email::Simple::Header';
 
-our $VERSION = '1.901';
+our $VERSION = '1.902';
 
 use Encode 1.9801;
 

Modified: branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Modifier.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Modifier.pm?rev=47094&op=diff
==============================================================================
--- branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Modifier.pm (original)
+++ branches/upstream/libemail-mime-perl/current/lib/Email/MIME/Modifier.pm Fri Nov 13 03:51:21 2009
@@ -4,7 +4,7 @@
 package Email::MIME::Modifier;
 
 use vars qw[$VERSION];
-$VERSION = '1.901';
+$VERSION = '1.902';
 
 use Email::MIME;
 
@@ -16,7 +16,7 @@
 
 =head1 VERSION
 
-version 1.901
+version 1.902
 
 =head1 PERL EMAIL PROJECT