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

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-03-15 18:31:38 +0000 (Thu, 15 Mar 2012)
New Revision: 14268

Modified:
   Catalyst-Plugin-Unicode-Encoding/trunk/Changes
   Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm
Log:
Fix issue with regex in last release. RT#75006

Modified: Catalyst-Plugin-Unicode-Encoding/trunk/Changes
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-03-15 07:59:17 UTC (rev 14267)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-03-15 18:31:38 UTC (rev 14268)
@@ -1,4 +1,5 @@
 Revision history for Perl extension Catalyst::Plugin::Unicode::Encoding
+    - Fix issue with regex in last release. RT#75006
 
 1.4 2012-03-13 22:28:00
     - Get charset parsing more correct in less trivial cases. 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-03-15 07:59:17 UTC (rev 14267)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm	2012-03-15 18:31:38 UTC (rev 14268)
@@ -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 .