aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 00:41:38 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 00:41:38 +0000
commit1a13281ab7d03cea082e4c6fbf2a9d5d12f7a177 (patch)
tree0e06ec5f62a175c1ba69501e606cab748749ca92
parent59e103794e793682eb431349280fb62871e9ba9e (diff)
downloadruby-1a13281ab7d03cea082e4c6fbf2a9d5d12f7a177.tar.gz
* ext/socket/socket.c (init_sock): socket is binmode on platforms
which support binmode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 88c5b26d53..2ab2aade28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 24 09:40:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/socket.c (init_sock): socket is binmode on platforms
+ which support binmode.
+
Tue Jun 24 00:21:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
* compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 7fe4e3defa..b4b6412f3a 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -240,6 +240,9 @@ init_sock(VALUE sock, int fd)
MakeOpenFile(sock, fp);
fp->fd = fd;
fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
+#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
+ fp->mode |= FMODE_BINMODE;
+#endif
if (do_not_reverse_lookup) {
fp->mode |= FMODE_NOREVLOOKUP;
}