X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee9a28abee8a08f5b5b658282159a4a6db966173..61e6a2ab5e3e1de051c3db492219627c368141f1:/src/mac/corefoundation/gsockosx.cpp

diff --git a/src/mac/corefoundation/gsockosx.cpp b/src/mac/corefoundation/gsockosx.cpp
index 0d2915900e..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();
@@ -123,6 +130,8 @@ void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
     struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent);
     if (data)
     {
+        if ( data->source )
+            CFRelease(data->source);
         if ( data->socket )
             CFRelease(data->socket);
         free(data);