mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-11 08:40:44 +00:00
Fixes for obscure problems with ssl connection when networks are extremely
slow or system is overloaded/blocked in some way. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21474 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ce3770a02c
commit
d75f98906c
2 changed files with 41 additions and 4 deletions
|
@ -1,3 +1,12 @@
|
|||
2005-07-14 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* SSL/GSSSLHandle.m: Retains self when running runloop to allow
|
||||
ssl connect and accept operations. If the connect/accept takes
|
||||
a long time, the caller might give up and release the handle,
|
||||
causing resources to be freed and the ssl operation to crash.
|
||||
Retaining self (and noticing when a disconnect has taken place)
|
||||
prevents that.
|
||||
|
||||
2005-07-13 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Source/NSBundle.m: When building paths inside framework
|
||||
|
|
|
@ -206,12 +206,17 @@ sslError(int err, int e)
|
|||
{
|
||||
ssl = SSL_new(ctx);
|
||||
}
|
||||
|
||||
RETAIN(self); // Don't get destroyed during runloop
|
||||
loop = [NSRunLoop currentRunLoop];
|
||||
ret = SSL_set_fd(ssl, descriptor);
|
||||
if (ret == 1)
|
||||
{
|
||||
[loop runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.01]];
|
||||
if (ssl == 0)
|
||||
{
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
ret = SSL_accept(ssl);
|
||||
}
|
||||
if (ret != 1)
|
||||
|
@ -222,7 +227,7 @@ sslError(int err, int e)
|
|||
NSTimeInterval last = 0.0;
|
||||
NSTimeInterval limit = 0.1;
|
||||
|
||||
final = [[NSDate alloc] initWithTimeIntervalSinceNow: 20.0];
|
||||
final = [[NSDate alloc] initWithTimeIntervalSinceNow: 30.0];
|
||||
when = [NSDate alloc];
|
||||
|
||||
err = SSL_get_error(ssl, ret);
|
||||
|
@ -235,6 +240,13 @@ sslError(int err, int e)
|
|||
last = tmp;
|
||||
when = [when initWithTimeIntervalSinceNow: limit];
|
||||
[loop runUntilDate: when];
|
||||
if (ssl == 0)
|
||||
{
|
||||
RELEASE(when);
|
||||
RELEASE(final);
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
ret = SSL_accept(ssl);
|
||||
if (ret != 1)
|
||||
{
|
||||
|
@ -255,10 +267,12 @@ sslError(int err, int e)
|
|||
NSLog(@"unable to accept SSL connection from %@:%@ - %@",
|
||||
address, service, str);
|
||||
ERR_print_errors_fp(stderr);
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
connected = YES;
|
||||
RELEASE(self);
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
@ -289,12 +303,17 @@ ERR_print_errors_fp(stderr);
|
|||
{
|
||||
ssl = SSL_new(ctx);
|
||||
}
|
||||
|
||||
RETAIN(self); // Don't get destroyed during runloop
|
||||
loop = [NSRunLoop currentRunLoop];
|
||||
ret = SSL_set_fd(ssl, descriptor);
|
||||
if (ret == 1)
|
||||
{
|
||||
[loop runUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.01]];
|
||||
if (ssl == 0)
|
||||
{
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
ret = SSL_connect(ssl);
|
||||
}
|
||||
if (ret != 1)
|
||||
|
@ -305,7 +324,7 @@ ERR_print_errors_fp(stderr);
|
|||
NSTimeInterval last = 0.0;
|
||||
NSTimeInterval limit = 0.1;
|
||||
|
||||
final = [[NSDate alloc] initWithTimeIntervalSinceNow: 20.0];
|
||||
final = [[NSDate alloc] initWithTimeIntervalSinceNow: 30.0];
|
||||
when = [NSDate alloc];
|
||||
|
||||
err = SSL_get_error(ssl, ret);
|
||||
|
@ -318,6 +337,13 @@ ERR_print_errors_fp(stderr);
|
|||
last = tmp;
|
||||
when = [when initWithTimeIntervalSinceNow: limit];
|
||||
[loop runUntilDate: when];
|
||||
if (ssl == 0)
|
||||
{
|
||||
RELEASE(when);
|
||||
RELEASE(final);
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
ret = SSL_connect(ssl);
|
||||
if (ret != 1)
|
||||
{
|
||||
|
@ -338,10 +364,12 @@ ERR_print_errors_fp(stderr);
|
|||
NSLog(@"unable to make SSL connection to %@:%@ - %@",
|
||||
address, service, str);
|
||||
ERR_print_errors_fp(stderr);
|
||||
RELEASE(self);
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
connected = YES;
|
||||
RELEASE(self);
|
||||
return YES;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue