Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: src/platform-win32.cc

Issue 42387: Change the socket close to shutdown (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform-macos.cc ('k') | test/cctest/test-sockets.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform-win32.cc
===================================================================
--- src/platform-win32.cc (revision 1538)
+++ src/platform-win32.cc (working copy)
@@ -1548,10 +1548,8 @@
socket_ = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
}
explicit Win32Socket(SOCKET socket): socket_(socket) { }
+ virtual ~Win32Socket() { Shutdown(); }
-
- virtual ~Win32Socket() { Close(); }
-
// Server initialization.
bool Bind(const int port);
bool Listen(int backlog) const;
@@ -1560,8 +1558,8 @@
// Client initialization.
bool Connect(const char* host, const char* port);
- // Close.
- bool Close();
+ // Shutdown socket for both read and write.
+ bool Shutdown();
// Data Transimission
int Send(const char* data, int len) const;
@@ -1639,12 +1637,13 @@
}
-bool Win32Socket::Close() {
+bool Win32Socket::Shutdown() {
if (IsValid()) {
- // Close socket.
- int rc = closesocket(socket_);
+ // Shutdown socket for both read and write.
+ int status = shutdown(socket_, SD_BOTH);
+ closesocket(socket_);
socket_ = INVALID_SOCKET;
- return rc != SOCKET_ERROR;
+ return status == SOCKET_ERROR;
}
return true;
}
« no previous file with comments | « src/platform-macos.cc ('k') | test/cctest/test-sockets.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698