[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-2-g9005f43

[David Christensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  9005f439862fd8d2deb9b3ca9849e0daf0a75d16 (commit)
      from  129c72277b366c802f96bb52a705c3e77096643d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9005f439862fd8d2deb9b3ca9849e0daf0a75d16
Author: David Christensen <david at endpoint.com>
Date:   Fri Sep 18 16:16:15 2009 -0500

    WIP: fix for later Encodes + Safe

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/File.pm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/Vend/File.pm b/lib/Vend/File.pm
index e456bf6..9d20432 100644
--- a/lib/Vend/File.pm
+++ b/lib/Vend/File.pm
@@ -236,8 +236,15 @@ sub readfile {
 		binmode(READIN) if $Global::Windows;
 
         if ($encoding) {
-            local $PerlIO::encoding::fallback = Encode::PERLQQ();
-            binmode(READIN, ":encoding($encoding)");
+            if ($encoding =~ /^utf-?8$/i) {
+                # if you say you're utf-8, we'll take you at your word...
+
+                binmode(READIN, ":utf8");
+            }
+            else {
+                local $PerlIO::encoding::fallback = Encode::PERLQQ();
+                binmode(READIN, ":encoding($encoding)");
+            }
         }
 
 		undef $/;


hooks/post-receive
-- 
Interchange