aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-16 11:42:03 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-16 11:42:03 +0000
commitbc843e4b7ddf11f80cea691033cbf8163c6272d3 (patch)
treee2de432f7f76c5d584211db88dc3fa940f9bb26c
parentcc6c3daaf36ab941c0c6dc1a194b18605aad3282 (diff)
downloadruby-bc843e4b7ddf11f80cea691033cbf8163c6272d3.tar.gz
* ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
listen(2) failure. reported by Xavier Shay. [ruby-core:35505] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/ipsocket.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8020693eef..0adb0c008d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 16 20:36:56 2011 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
+ listen(2) failure.
+ reported by Xavier Shay. [ruby-core:35505]
+
Wed Mar 16 15:06:21 2011 Eric Hodel <drbrain@segment7.net>
* ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index dd7eb80b55..c01f714ce6 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -108,7 +108,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
status = listen(fd, 5);
if (status < 0) {
close(fd);
- syscall = "listen(2)";
+ rb_sys_fail("listen(2)");
}
}