diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 17:53:20 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 17:53:20 +0000 |
commit | 3006e5ea78a41950e57c8f568fccf26c95ecc1e6 (patch) | |
tree | 606734935399855e165e3eeb18fbfa6ef1af6311 | |
parent | 1ca597236fda4c8c237f84956c77bb95f2b05df5 (diff) | |
download | ruby-3006e5ea78a41950e57c8f568fccf26c95ecc1e6.tar.gz |
* ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
only when vmaxdatlen is nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/ancdata.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Nov 19 02:52:30 2015 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size + only when vmaxdatlen is nil. + Thu Nov 19 02:20:11 2015 Tanaka Akira <akr@fsij.org> * test/socket/test_socket.rb (test_udp_recvmsg_truncation): rflags is diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 1a6b50958c..93615f2766 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1571,7 +1571,7 @@ bsock_recvmsg_internal(VALUE sock, goto retry; } #else - if (grow_buffer && errno == EMSGSIZE) + if (NIL_P(vmaxdatlen) && grow_buffer && errno == EMSGSIZE) ss = (ssize_t)iov.iov_len; else #endif |