merges r20847 from trunk into ruby_1_9_1.

* ext/socket/socket.c (unix_recv_io): relax msg_controllen error
  check.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 25ae0d5f65..9bf2a5be85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 17 19:39:44 2008  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (unix_recv_io): relax msg_controllen error
+	  check.
+
 Wed Dec 17 19:37:30 2008  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pty/extconf.rb: check util.h for OpenBSD.