shutdown sockets gracefully instead of doing it with TCP reset (patch 1682438)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 5546f5cc0eebc9b17c188717309981f42ba36af2..9cf03f058d99e9c4cecea209608ea24da914dc3e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,7 +66,11 @@ wxMSW:
 2.8.3
 -----
 
-wxMac
+All:
+
+- Shut down the sockets gracefully (Sergio Aguayo)
+
+wxMac:
 
 - Corrected top border size for wxStaticBox with empty label (nusi)
 

diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp
index c107146e2c615ede248523219ddb330278552e40..2edc3ab24796396c89d07cbb61a85c201a92798c 100644 (file)
--- a/src/msw/gsocket.cpp
+++ b/src/msw/gsocket.cpp
@@ -222,7 +222,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1 /* SD_SEND */);
     Close();
   }
 

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 6e0292a78bc0144d4f1918a3f1c629a9d6e03db7..eeee3fa8cca875d04ede6be217549614574a471a 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -587,7 +587,7 @@ void GSocket::Shutdown()
   /* If socket has been created, shutdown it */
   if (m_fd != INVALID_SOCKET)
   {
-    shutdown(m_fd, 2);
+    shutdown(m_fd, 1);
     Close();
   }