diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 01:37:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 01:37:34 +0000 |
| commit | d8e1939232b5f12ae79aca0975ef222008f4454b (patch) | |
| tree | 43affcfa3d6c1b96015ff1d459a546b3ae118a3b | |
| parent | ca5f5871e8f54c76e804fb179e32a2ffa6fda4dc (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -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)"); } |