Win32 fix: reverting commit 12210 (after a discussion with t0m) - all tests pass...

diff --git a/Changes b/Changes
index e3ba891..97835e9 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,9 +3,6 @@
   Bug fixes:
    - Fix slurping a file to work correctly with binary on Win32 in the
      encoding test controller.
-   - Skip test for outputting the wrong content length when a string
-     which has been utf-8 upgraded is output on Win32 as there is an
-     off by one error somewhere.
    - Allow --restartdirectory as an option for the Server script, for
      backwards compatibility. (Dave Rolsky)
 

diff --git a/t/aggregate/utf8_content_length.t b/t/aggregate/utf8_content_length.t
index a5eacc4..86297e8 100644 (file)
--- a/t/aggregate/utf8_content_length.t
+++ b/t/aggregate/utf8_content_length.t
@@ -20,13 +20,7 @@ my $size = -s $fn;
     is $r->code, 200, '/binary OK';
     is $r->header('Content-Length'), $size, '/binary correct content length';
 }
-SKIP: {
-    # Test that even if what is really binary has been upgraded into character
-    # octets in perl, then when we output it we get the correct content length.
-    # The issue was initially described in the thread 'Avoiding UTF8 in
-    # Catalyst': http://lists.scsys.co.uk/pipermail/catalyst/2009-November/023912.html.
-    # FIXME! (See ml thread re 5.80015 release)
-    skip 'Known not to work on Win32', 2 if ($^O eq 'MSWin32');
+{
     my $r = request('/binary_utf8');
     is $r->code, 200, '/binary_utf8 OK';
     is $r->header('Content-Length'), $size, '/binary_utf8 correct content length';