Merge in the latest changes from the 0.9.6-stable branch.

This commit is contained in:
Richard Levitte
2002-01-26 01:18:50 +00:00
parent 3964db29c4
commit 41aad62a78
28 changed files with 649 additions and 201 deletions

View File

@@ -795,7 +795,10 @@ int SSL_shutdown(SSL *s)
int SSL_renegotiate(SSL *s)
{
s->new_session=1;
if (s->new_session == 0)
{
s->new_session=1;
}
return(s->method->ssl_renegotiate(s));
}