aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-02 22:34:29 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-02 22:34:29 +0000
commit2a5b45ddc5e533ed69e656a4d384c1d4dd0dbac6 (patch)
tree745bd06d07576e2936848467e584b0ba48020b94
parentda56b059bc5aa7ca665eeea7419964d106051e48 (diff)
downloadruby-2a5b45ddc5e533ed69e656a4d384c1d4dd0dbac6.tar.gz
* ext/socket/tcpserver.c: Grammar for TCPServer.new from r39554
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/tcpserver.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 28f2e0a349..331e261a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 3 07:33:00 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * ext/socket/tcpserver.c: Grammar for TCPServer.new from r39554
+
Sun Mar 3 01:17:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems/ext/ext_conf_builder.rb
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
index 4c011ac229..2ca2a188a6 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -26,8 +26,8 @@
* Internally, TCPServer.new calls getaddrinfo() function to
* obtain addresses.
* If getaddrinfo() returns multiple addresses,
- * TCPServer.new try to create a server socket for each addresses
- * and return first one succeed.
+ * TCPServer.new tries to create a server socket for each address
+ * and returns first one that is successful.
*
*/
static VALUE