Commit f4f26dd3 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029

parents 91611dae cf23558d
...@@ -171,13 +171,25 @@ int SSL_accept(SSL* ssl) ...@@ -171,13 +171,25 @@ int SSL_accept(SSL* ssl)
sendServerHelloDone(*ssl); sendServerHelloDone(*ssl);
ssl->flushBuffer(); ssl->flushBuffer();
processReply(*ssl); // Java Client sends fragmented response
while (ssl->getStates().getServer() <
clientFinishedComplete) {
if (ssl->GetError()) break;
processReply(*ssl);
}
} }
sendChangeCipher(*ssl); sendChangeCipher(*ssl);
sendFinished(*ssl, server_end); sendFinished(*ssl, server_end);
ssl->flushBuffer(); ssl->flushBuffer();
if (ssl->getSecurity().get_resuming()) if (ssl->getSecurity().get_resuming()) {
processReply(*ssl);
// Java Client sends fragmented response
while (ssl->getStates().getServer() <
clientFinishedComplete) {
if (ssl->GetError()) break;
processReply(*ssl);
}
}
ssl->useLog().ShowTCP(ssl->getSocket().get_fd()); ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment