Fix for unexplained change in socket behavior where failed connections throw a CONNEC...

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

diff --git a/src/mac/corefoundation/gsockosx.cpp b/src/mac/corefoundation/gsockosx.cpp
index 628cf4778614f42c82a6e2f2f9d7d046a1414bca..9e057ad1f48c215661b529743910197dc9f4e04f 100644 (file)
--- a/src/mac/corefoundation/gsockosx.cpp
+++ b/src/mac/corefoundation/gsockosx.cpp
@@ -39,7 +39,14 @@ void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType,
   {
     case kCFSocketConnectCallBack:
       assert(!socket->m_server);
-      socket->Detected_Write();
+      // KH: If data is non-NULL, the connect failed, do not call Detected_Write,
+      // which will only end up creating a spurious connect event because the
+      // call to getsocketopt SO_ERROR inexplicably returns no error.
+      // The change in behavior cannot be traced to any particular commit or
+      // timeframe so I'm not sure what to think, but after so many hours,
+      // this seems to address the issue and it's time to move on.
+      if (data == NULL)
+        socket->Detected_Write();
       break;
     case kCFSocketReadCallBack:
       socket->Detected_Read();