X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/577b58dfe986b63fc7c4aea5703000ffb0605b1d..1a1498c08b07625baa087622e75637a2f15325b6:/src/mac/corefoundation/gsockosx.cpp?ds=inline

diff --git a/src/mac/corefoundation/gsockosx.cpp b/src/mac/corefoundation/gsockosx.cpp
index 628cf47786..9e057ad1f4 100644
--- 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();