summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 23:20:15 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-11 23:20:15 +0000
commit562257497691b7ddc8032a872693b23918aa5726 (patch)
treedf4b37b666f354ace45dde86c35fdd2f11e72a6e
parent9536568d3e46da2a028fcc5e15a79589f5187942 (diff)
* ext/socket/ipsocket.c (init_inetsock_internal): use SOMAXCONN for
listen backlog. * ext/socket/unixsocket.c (rsock_init_unixsock): ditto. * ext/socket/lib/socket.rb (Addrinfo#listen): ditto. (Socket.tcp_server_sockets_port0): ditto. * ext/socket/mkconstants.rb: define SOMAXCONN as 5 if not available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--ext/socket/ipsocket.c2
-rw-r--r--ext/socket/lib/socket.rb4
-rw-r--r--ext/socket/mkconstants.rb2
-rw-r--r--ext/socket/unixsocket.c2
5 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 56d1de3bad..56d29b7a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Aug 12 08:17:46 2011 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/ipsocket.c (init_inetsock_internal): use SOMAXCONN for
+ listen backlog.
+
+ * ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+
+ * ext/socket/lib/socket.rb (Addrinfo#listen): ditto.
+ (Socket.tcp_server_sockets_port0): ditto.
+
+ * ext/socket/mkconstants.rb: define SOMAXCONN as 5 if not available.
+
Fri Aug 12 03:24:35 2011 Eric Hodel <drbrain@segment7.net>
* lib/rdoc: Import RDoc 3.9.2. Fixes TIDYLINK for HTML output.
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index 9d713d0afd..bc93140d68 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -105,7 +105,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
arg->fd = -1;
if (type == INET_SERVER) {
- status = listen(fd, 5);
+ status = listen(fd, SOMAXCONN);
if (status < 0) {
close(fd);
rb_sys_fail("listen(2)");
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 34a4379336..d5201ef788 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -182,7 +182,7 @@ class Addrinfo
end
# creates a listening socket bound to self.
- def listen(backlog=5)
+ def listen(backlog=Socket::SOMAXCONN)
sock = Socket.new(self.pfamily, self.socktype, self.protocol)
begin
sock.ipv6only! if self.ipv6?
@@ -386,7 +386,7 @@ class Socket < BasicSocket
ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
sockets = ip_sockets_port0(ai_list, true)
sockets.each {|s|
- s.listen(5)
+ s.listen(Socket::SOMAXCONN)
}
sockets
ensure
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 124a094946..613850777d 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -688,7 +688,7 @@ INET6_ADDRSTRLEN 46 Maximum length of an IPv6 address string
IFNAMSIZ nil Maximum interface name size
IF_NAMESIZE nil Maximum interface name size
-SOMAXCONN nil Maximum connection requests that may be queued for a socket
+SOMAXCONN 5 Maximum connection requests that may be queued for a socket
SCM_RIGHTS nil Access rights
SCM_TIMESTAMP nil Timestamp (timeval)
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index f29724db25..f8017924a8 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -66,7 +66,7 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
}
if (server) {
- if (listen(fd, 5) < 0) {
+ if (listen(fd, SOMAXCONN) < 0) {
close(fd);
rb_sys_fail("listen(2)");
}