summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/socket/lib/socket.rb1
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40038fcb05..8b5ec0f67b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 27 14:57:33 2016 Kazuki Yamaguchi <k@rhe.jp>
+
+ * ext/socket/lib/socket.rb (UDPSocket#recvfrom_nonblock): [DOC] Remove
+ a false statement "If _maxlen_ is omitted, its default value is
+ 65536." maxlen, the first parameter, cannot be omitted as the method
+ signature indicates. This hasn't changed ever since it was first
+ implemented.
+
Thu Oct 27 09:42:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_convert_to_integer): convert a fixable float to a
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 5c3ed400f4..46361c6c15 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -1215,7 +1215,6 @@ class UDPSocket < IPSocket
#
# Receives up to _maxlen_ bytes from +udpsocket+ using recvfrom(2) after
# O_NONBLOCK is set for the underlying file descriptor.
- # If _maxlen_ is omitted, its default value is 65536.
# _flags_ is zero or more of the +MSG_+ options.
# The first element of the results, _mesg_, is the data received.
# The second element, _sender_inet_addr_, is an array to represent the sender address.