summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 11202f5dd5..9cf074b219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 8 11:52:51 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_fclose, rb_w32_close): shutdown socket
+ before closesocket(). fixed: [ruby-dev:25112]
+
Wed Dec 8 11:46:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (string_content): get rid of segfault at empty evstr.
diff --git a/win32/win32.c b/win32/win32.c
index fd0f5a852c..0808e49d1b 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3405,6 +3405,8 @@ rb_w32_fclose(FILE *fp)
}
_set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE);
fclose(fp);
+ shutdown(sock, 0);
+ shutdown(sock, 1);
if (closesocket(sock) == SOCKET_ERROR) {
errno = map_errno(WSAGetLastError());
return -1;
@@ -3421,6 +3423,8 @@ rb_w32_close(int fd)
UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN);
return _close(fd);
}
+ shutdown(sock, 0);
+ shutdown(sock, 1);
if (closesocket(sock) == SOCKET_ERROR) {
errno = map_errno(WSAGetLastError());
return -1;