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

Fix looping session startup

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38386 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-03-08 09:22:11 +00:00
parent 17fc6e1aeb
commit 87142c6535
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2015-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSFileHandle.m: ([-sslHandshakeEstablished:outgoing:])
If we can't create a session, the handshake should fail rather
than being retried. Fix infinite loop establish session on closed
handle.
2015-02-28 Richard Frith-Macdonald <rfm@gnu.org> 2015-02-28 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/NSDebug+GNUstepBase.h: * Headers/GNUstepBase/NSDebug+GNUstepBase.h:

7
Source/NSFileHandle.m
View file

@ -1001,12 +1001,14 @@ GSTLSHandlePush(gnutls_transport_ptr_t handle, const void *buffer, size_t len)
if (YES == [session active]) if (YES == [session active])
{ {
*result = YES;
return YES; /* Already connected. */ return YES; /* Already connected. */
} }
if (YES == isStandardFile) if (YES == isStandardFile)
{ {
NSLog(@"Attempt to perform ssl handshake with a standard file"); NSLog(@"Attempt to perform ssl handshake with a standard file");
*result = NO;
return YES; return YES;
} }
@ -1046,6 +1048,11 @@ GSTLSHandlePush(gnutls_transport_ptr_t handle, const void *buffer, size_t len)
if (NO == [session handshake]) if (NO == [session handshake])
{ {
*result = NO;
if (nil == session)
{
return YES; // Unable to create session
}
return NO; // Need more. return NO; // Need more.
} }
else else