mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
into neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029
This commit is contained in:
commit
b92a933dfe
1 changed files with 15 additions and 3 deletions
|
@ -171,13 +171,25 @@ int SSL_accept(SSL* ssl)
|
|||
sendServerHelloDone(*ssl);
|
||||
ssl->flushBuffer();
|
||||
|
||||
processReply(*ssl);
|
||||
// Java Client sends fragmented response
|
||||
while (ssl->getStates().getServer() <
|
||||
clientFinishedComplete) {
|
||||
if (ssl->GetError()) break;
|
||||
processReply(*ssl);
|
||||
}
|
||||
}
|
||||
sendChangeCipher(*ssl);
|
||||
sendFinished(*ssl, server_end);
|
||||
ssl->flushBuffer();
|
||||
if (ssl->getSecurity().get_resuming())
|
||||
processReply(*ssl);
|
||||
if (ssl->getSecurity().get_resuming()) {
|
||||
|
||||
// Java Client sends fragmented response
|
||||
while (ssl->getStates().getServer() <
|
||||
clientFinishedComplete) {
|
||||
if (ssl->GetError()) break;
|
||||
processReply(*ssl);
|
||||
}
|
||||
}
|
||||
|
||||
ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
|
||||
|
||||
|
|
Loading…
Reference in a new issue