diff --git a/ChangeLog b/ChangeLog index 2916d7d8c..581108c20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * Source/NSMessagePortNameServer.m: Tolerate '*' host name. * Source/NSConnection.m: Clarify documentation slightly. + * NSSocketPort.m: + * win32/GSFileHandle.m: + Fixup missing notification changes. 2009-11-27 Richard Frith-Macdonald diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m index 8f9b08b90..d7f3a1597 100644 --- a/Source/NSSocketPort.m +++ b/Source/NSSocketPort.m @@ -1266,7 +1266,7 @@ static Class runLoopClass; if (ocurredEvents.lNetworkEvents & FD_CONNECT) { [self receivedEventWrite]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); if (desc == INVALID_SOCKET) { M_UNLOCK(myLock); @@ -1277,7 +1277,7 @@ static Class runLoopClass; if (ocurredEvents.lNetworkEvents & FD_READ) { [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); if (desc == INVALID_SOCKET) { M_UNLOCK(myLock); @@ -1288,7 +1288,7 @@ static Class runLoopClass; if (ocurredEvents.lNetworkEvents & FD_OOB) { [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); if (desc == INVALID_SOCKET) { M_UNLOCK(myLock); @@ -1300,7 +1300,7 @@ static Class runLoopClass; { readyToSend = YES; [self receivedEventWrite]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); if (desc == INVALID_SOCKET) { M_UNLOCK(myLock); @@ -1311,7 +1311,7 @@ static Class runLoopClass; if (ocurredEvents.lNetworkEvents & FD_CLOSE) { [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); if (desc == INVALID_SOCKET) { M_UNLOCK(myLock); diff --git a/Source/win32/GSFileHandle.m b/Source/win32/GSFileHandle.m index 9b61e6f3b..fd9646794 100644 --- a/Source/win32/GSFileHandle.m +++ b/Source/win32/GSFileHandle.m @@ -2239,35 +2239,35 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr"; NSDebugMLLog(@"NSFileHandle", @"Connect on %x", extra); ocurredEvents.lNetworkEvents ^= FD_CONNECT; [self receivedEventWrite]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents & FD_ACCEPT) { NSDebugMLLog(@"NSFileHandle", @"Accept on %x", extra); ocurredEvents.lNetworkEvents ^= FD_ACCEPT; [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents & FD_WRITE) { NSDebugMLLog(@"NSFileHandle", @"Write on %x", extra); ocurredEvents.lNetworkEvents ^= FD_WRITE; [self receivedEventWrite]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents & FD_READ) { NSDebugMLLog(@"NSFileHandle", @"Read on %x", extra); ocurredEvents.lNetworkEvents ^= FD_READ; [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents & FD_OOB) { NSDebugMLLog(@"NSFileHandle", @"OOB on %x", extra); ocurredEvents.lNetworkEvents ^= FD_OOB; [self receivedEventRead]; - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents & FD_CLOSE) { @@ -2281,7 +2281,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr"; { [self receivedEventRead]; } - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } if (ocurredEvents.lNetworkEvents) { @@ -2299,7 +2299,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr"; { [self receivedEventRead]; } - GSPrivateNotifyASAP(); + GSPrivateNotifyASAP(mode); } }