summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/socket.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ad2afe781f..e4150ab761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 28 13:20:11 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/socket.c (init_inetsock_internal): remove setting
+ SO_REUSEADDR option on server socket. fixed: [ruby-core:6765]
+ ([ ruby-Bugs-2872 ])
+
Mon Nov 28 13:11:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 94c72c5c42..286de4b6f7 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1179,11 +1179,6 @@ init_inetsock_internal(arg)
}
arg->fd = fd;
if (type == INET_SERVER) {
-#ifndef _WIN32
- status = 1;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
- (char*)&status, sizeof(status));
-#endif
status = bind(fd, res->ai_addr, res->ai_addrlen);
syscall = "bind(2)";
}