2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3fdc5f181..05f73ee81f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  2 08:54:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::NEEDS_BINMODE): check if O_BINARY value instead
+	  of fragile check by platform name.
+
 Sun May  2 07:38:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (dir_config): should not modify argument arrays
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 698c7ce344..41efea9c72 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -13,7 +13,7 @@ class CGI
 
   REVISION = '$Id$' #:nodoc:
 
-  NEEDS_BINMODE = true if /WIN/i.match(RUBY_PLATFORM)
+  NEEDS_BINMODE = File::BINARY != 0
 
   # Path separators in different environments.
   PATH_SEPARATOR = {'UNIX'=>'/', 'WINDOWS'=>'\\', 'MACINTOSH'=>':'}