summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 14:37:18 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 14:37:18 +0000
commit2a628fe11156ac1123e6402235f7667493d29607 (patch)
tree353c879475a4e80c88c8b53ba062f0467f4bb040
parentc6892791abb4ed873d05df4805954bb9a136bae2 (diff)
* win32/win32.c (rb_w32_accept): commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/win32.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bfb3df5f5..5a1400bd43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 11 23:36:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_accept): commit miss.
+
Tue Nov 11 23:02:27 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* man/ruby.1 (RUBYOPT): wrote which option can appear.
diff --git a/win32/win32.c b/win32/win32.c
index f9333d0283..f2129afac8 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2310,6 +2310,7 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock)));
_set_osfhnd(fd, r);
MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
+ CloseHandle(h);
st_insert(socklist, (st_data_t)r, (st_data_t)0);
}
else {
@@ -2318,6 +2319,8 @@ rb_w32_accept(int s, struct sockaddr *addr, int *addrlen)
fd = -1;
}
}
+ else
+ CloseHandle(h);
});
return fd;
}