[Catalyst-commits] r14289 - in Catalyst-Plugin-Unicode-Encoding/trunk: . lib/Catalyst/Plugin/Unicode

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-05-05 13:19:53 +0000 (Sat, 05 May 2012)
New Revision: 14289

Modified:
   Catalyst-Plugin-Unicode-Encoding/trunk/Changes
   Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm
Log:
Checking in changes prior to tagging of version 1.6.

Changelog diff is:

Index: Changes
===================================================================
--- Changes	(revision 14288)
+++ Changes	(working copy)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::Unicode::Encoding
 
+1.6 2012-05-05 14:18:00
+    - And another issue with the same regex. RT#75006
+
 1.5 2012-03-15 18:32:00
     - Fix issue with regex in last release. RT#75006
 


Modified: Catalyst-Plugin-Unicode-Encoding/trunk/Changes
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-05-04 17:08:58 UTC (rev 14288)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-05-05 13:19:53 UTC (rev 14289)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::Unicode::Encoding
 
+1.6 2012-05-05 14:18:00
+    - And another issue with the same regex. RT#75006
+
 1.5 2012-03-15 18:32:00
     - Fix issue with regex in last release. RT#75006
 

Modified: Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm	2012-05-04 17:08:58 UTC (rev 14288)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm	2012-05-05 13:19:53 UTC (rev 14289)
@@ -10,7 +10,7 @@
 use Encode 2.21 ();
 our $CHECK = Encode::FB_CROAK | Encode::LEAVE_SRC;
 
-our $VERSION = '1.5';
+our $VERSION = '1.6';
 
 __PACKAGE__->mk_classdata('_encoding');
 
@@ -56,7 +56,7 @@
     return $c->next::method(@_)
       unless $c->response->content_type =~ /^text|xml$|javascript$/;
 
-    if ($ct_enc && $ct_enc =~ /charset=([^;]+)$/) {
+    if ($ct_enc && $ct_enc =~ /charset=([^;]*?)/) {
         if (uc($1) ne $enc->mime_name) {
             $c->log->debug("Unicode::Encoding is set to encode in '" .
                            $enc->mime_name .