summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/ancdata.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3defbae211..b5a13556d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 18 10:33:06 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
+ when EMSGSIZE occurs on non HAVE_STRUCT_MSGHDR_MSG_CONTROL platforms
+ (such as, Windows). fixes a test error revealed by r52625.
+
Wed Nov 18 10:12:36 2015 Eric Wong <e@80x24.org>
* ext/socket/ancdata.c (bsock_recvmsg_internal): use 4096 as
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 9d28573fde..1a6b50958c 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1570,6 +1570,10 @@ bsock_recvmsg_internal(VALUE sock,
gc_done = 1;
goto retry;
}
+#else
+ if (grow_buffer && errno == EMSGSIZE)
+ ss = (ssize_t)iov.iov_len;
+ else
#endif
rb_sys_fail("recvmsg(2)");
}