Commit fbe338f4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
parents 6e100a3c 3cf33e7a

extra/yassl/src/ssl.cpp

+15 −3
Original line number Diff line number Diff line
@@ -171,13 +171,25 @@ int SSL_accept(SSL* ssl) 
        sendServerHelloDone(*ssl);

        ssl->flushBuffer();



        // 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())

    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());