[Catalyst-commits] r12209 - in Catalyst-Runtime/5.80/trunk: . t/lib/TestAppEncoding/Controller

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-12-06 12:47:59 +0000 (Sun, 06 Dec 2009)
New Revision: 12209

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/t/lib/TestAppEncoding/Controller/Root.pm
Log:
Win32 fix, kmx++

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-12-06 12:33:04 UTC (rev 12208)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-12-06 12:47:59 UTC (rev 12209)
@@ -1,5 +1,9 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+  Bug fixes:
+   - Fix slurping a file to work correctly with binary on Win32 in the
+     encoding test controller.
+
   New features:
    - The __MOP__ hash element is suppressed from being dumped fully
      (and instead stringified) when dumping the error screen to be

Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestAppEncoding/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestAppEncoding/Controller/Root.pm	2009-12-06 12:33:04 UTC (rev 12208)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestAppEncoding/Controller/Root.pm	2009-12-06 12:47:59 UTC (rev 12209)
@@ -8,7 +8,7 @@
 
 sub binary : Local {
     my ($self, $c) = @_;
-    $c->res->body(do { open(my $fh, '<', $c->path_to('..', '..', 'catalyst_130pix.gif')) or die $!; local $/ = undef; <$fh>; });
+    $c->res->body(do { open(my $fh, '<', $c->path_to('..', '..', 'catalyst_130pix.gif')) or die $!; binmode($fh); local $/ = undef; <$fh>; });
 }
 
 sub binary_utf8 : Local {