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

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-03-13 22:28:16 +0000 (Tue, 13 Mar 2012)
New Revision: 14261

Modified:
   Catalyst-Plugin-Unicode-Encoding/trunk/Changes
   Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm
Log:
Get charset parsing more correct in less trivial cases. RT#75006

Modified: Catalyst-Plugin-Unicode-Encoding/trunk/Changes
===================================================================
--- Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-03-08 16:27:11 UTC (rev 14260)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/Changes	2012-03-13 22:28:16 UTC (rev 14261)
@@ -1,5 +1,7 @@
 Revision history for Perl extension Catalyst::Plugin::Unicode::Encoding
 
+    - Get charset parsing more correct in less trivial cases. RT#75006
+
 1.3 2011-11-22 19:38:00
     - Correctly decode nested parameters (from Catalyst::Plugin::Params::Nested)
     - Require Class::Data::Inheritable. RT#71674

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-08 16:27:11 UTC (rev 14260)
+++ Catalyst-Plugin-Unicode-Encoding/trunk/lib/Catalyst/Plugin/Unicode/Encoding.pm	2012-03-13 22:28:16 UTC (rev 14261)
@@ -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 .