From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 6 Dec 2009 12:47:59 +0000 (+0000)
Subject: Win32 fix, kmx++
X-Git-Tag: 5.80016~20
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=b42b9094c7f1a5cf0cb7750255ea6b0a1de45ddf;hp=c96cdcef894409be1a70c0d0876c05d5d0687a22

Win32 fix, kmx++
---

diff --git a/Changes b/Changes
index 4fa4a01..9b47f27 100644
--- a/Changes
+++ b/Changes
@@ -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
diff --git a/t/lib/TestAppEncoding/Controller/Root.pm b/t/lib/TestAppEncoding/Controller/Root.pm
index b5b3eeb..391a2cd 100644
--- a/t/lib/TestAppEncoding/Controller/Root.pm
+++ b/t/lib/TestAppEncoding/Controller/Root.pm
@@ -8,7 +8,7 @@ __PACKAGE__->config->{namespace} = '';
 
 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 {