gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37391 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-11-21 16:45:01 +00:00
parent 971a8374a8
commit 0e8eff792c
4 changed files with 18 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,10 +1,3 @@
2013-11-21 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSFileHandle.m: Do an -sslDisconnect while finalising
(before underlying network connection is closed).
* Source/NSFileHandle.m: Add assertion to check that TLS has been
shut down by concrete subclass dealloc.
2013-11-20 Richard Frith-Macdonald <rfm@gnu.org> 2013-11-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: Fix for bug 40620 * Source/NSUserDefaults.m: Fix for bug 40620

12
Source/GSFileHandle.m
View file

@ -214,7 +214,8 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey";
[self ignoreWriteDescriptor]; [self ignoreWriteDescriptor];
#if USE_ZLIB #if USE_ZLIB
/* The gzDescriptor should always be closed when we have done with it. /*
* The gzDescriptor should always be closed when we have done with it.
*/ */
if (gzDescriptor != 0) if (gzDescriptor != 0)
{ {
@ -222,14 +223,6 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey";
gzDescriptor = 0; gzDescriptor = 0;
} }
#endif #endif
/* Ensure any SSL/TLS connection has been properly shut down.
*/
[self sslDisconnect];
/* Close file descriptor if necessary (setting correct non-blocking
* characteristics since we may have changed them).
*/
if (descriptor != -1) if (descriptor != -1)
{ {
[self setNonBlocking: wasNonBlocking]; [self setNonBlocking: wasNonBlocking];
@ -239,7 +232,6 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey";
descriptor = -1; descriptor = -1;
} }
} }
[super finalize];
} }
// Initializing a GSFileHandle Object // Initializing a GSFileHandle Object

32
Source/NSFileHandle.m
View file

@ -953,22 +953,29 @@ GSTLSHandlePush(gnutls_transport_ptr_t handle, const void *buffer, size_t len)
- (void) closeFile - (void) closeFile
{ {
[self sslDisconnect]; // Shut down TLS before closing socket [self sslDisconnect];
[super closeFile]; [super closeFile];
} }
- (void) dealloc - (void) dealloc
{ {
/* Any TLS connection needs to be shut down before the network connection // TLS may need to read data during teardown, and we need to wait for it.
* is closed, which means that the concrete subclass must do that. [self setNonBlocking: NO];
* Therefore, the session should be inactive by the time we get here. // Don't DESTROY ivars below. First release them, then set nil, because
*/ // `session' may need this back-reference during TLS teardown.
NSAssert(NO == [session active], NSInternalInconsistencyException); TEST_RELEASE(opts);
DESTROY(session); TEST_RELEASE(session);
DESTROY(opts); opts = nil;
session = nil;
[super dealloc]; [super dealloc];
} }
- (void) finalize
{
[self sslDisconnect];
[super finalize];
}
- (NSInteger) read: (void*)buf length: (NSUInteger)len - (NSInteger) read: (void*)buf length: (NSUInteger)len
{ {
if (YES == [session active]) if (YES == [session active])
@ -980,14 +987,7 @@ GSTLSHandlePush(gnutls_transport_ptr_t handle, const void *buffer, size_t len)
- (void) sslDisconnect - (void) sslDisconnect
{ {
if (nil != session) [session disconnect];
{
// TLS may need to read data during teardown, and we need to wait for it.
[self setNonBlocking: NO];
[session disconnect];
DESTROY(session);
}
DESTROY(opts);
} }
- (BOOL) sslHandshakeEstablished: (BOOL*)result outgoing: (BOOL)isOutgoing - (BOOL) sslHandshakeEstablished: (BOOL*)result outgoing: (BOOL)isOutgoing

5
Source/win32/GSFileHandle.m
View file

@ -270,11 +270,6 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin)
gzclose(gzDescriptor); gzclose(gzDescriptor);
} }
#endif #endif
/* Ensure any SSL/TLS connection has been properly shut down.
*/
[self sslDisconnect];
if (descriptor != -1) if (descriptor != -1)
{ {
[self setNonBlocking: wasNonBlocking]; [self setNonBlocking: wasNonBlocking];