Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
This commit is contained in:
commit
a9b3767874
@ -171,13 +171,25 @@ int SSL_accept(SSL* ssl)
|
|||||||
sendServerHelloDone(*ssl);
|
sendServerHelloDone(*ssl);
|
||||||
ssl->flushBuffer();
|
ssl->flushBuffer();
|
||||||
|
|
||||||
|
// Java Client sends fragmented response
|
||||||
|
while (ssl->getStates().getServer() <
|
||||||
|
clientFinishedComplete) {
|
||||||
|
if (ssl->GetError()) break;
|
||||||
processReply(*ssl);
|
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()) {
|
||||||
|
|
||||||
|
// Java Client sends fragmented response
|
||||||
|
while (ssl->getStates().getServer() <
|
||||||
|
clientFinishedComplete) {
|
||||||
|
if (ssl->GetError()) break;
|
||||||
processReply(*ssl);
|
processReply(*ssl);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
|
ssl->useLog().ShowTCP(ssl->getSocket().get_fd());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user