Differences From Artifact [bc21bce60d]:
- File src/OFStreamSocket.m — part of check-in [c7f0229795] at 2020-01-02 01:51:34 on branch trunk — Update copyright (user: js, size: 4076) [annotate] [blame] [check-ins using] [more...]
To Artifact [6026b8fcfc]:
- File
src/OFStreamSocket.m
— part of check-in
[cea3f2133d]
at
2020-01-12 16:22:49
on branch trunk
— Cancel async requests in OFStreamSocket instead
Closing them in OFStream would result in always canceling them after
closing the socket due to the -[close] chaining - which could never
work. (user: js, size: 4136) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
172 173 174 175 176 177 178 179 180 181 182 183 184 185 |
#endif
}
- (void)close
{
if (_socket == INVALID_SOCKET)
@throw [OFNotOpenException exceptionWithObject: self];
closesocket(_socket);
_socket = INVALID_SOCKET;
_atEndOfStream = false;
[super close];
| > > > > | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 |
#endif
}
- (void)close
{
if (_socket == INVALID_SOCKET)
@throw [OFNotOpenException exceptionWithObject: self];
#ifdef OF_HAVE_SOCKETS
[self cancelAsyncRequests];
#endif
closesocket(_socket);
_socket = INVALID_SOCKET;
_atEndOfStream = false;
[super close];
|
| ︙ | ︙ |