[前][次][番号順一覧][スレッド一覧]

ruby-changes:40579

From: usa <ko1@a...>
Date: Thu, 19 Nov 2015 02:53:31 +0900 (JST)
Subject: [ruby-changes:40579] usa:r52658 (trunk): * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size

usa	2015-11-19 02:53:20 +0900 (Thu, 19 Nov 2015)

  New Revision: 52658

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52658

  Log:
    * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
      only when vmaxdatlen is nil.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52657)
+++ ChangeLog	(revision 52658)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Nov 19 02:52:30 2015  NAKAMURA Usaku  <usa@r...>
+
+	* 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@f...>
 
 	* test/socket/test_socket.rb (test_udp_recvmsg_truncation): rflags is
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 52657)
+++ ext/socket/ancdata.c	(revision 52658)
@@ -1571,7 +1571,7 @@ bsock_recvmsg_internal(VALUE sock, https://github.com/ruby/ruby/blob/trunk/ext/socket/ancdata.c#L1571
 	    goto retry;
         }
 #else
-	if (grow_buffer && errno == EMSGSIZE)
+	if (NIL_P(vmaxdatlen) && grow_buffer && errno == EMSGSIZE)
 	    ss = (ssize_t)iov.iov_len;
 	else
 #endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]