From d8e1939232b5f12ae79aca0975ef222008f4454b Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Nov 2015 01:37:34 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/socket/ancdata.c | 4 ++++ 2 files changed, 10 insertions(+) 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 + + * 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 * 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)"); } -- cgit v1.2.3