From: Date: September 15 2005 9:46am
Subject: bk commit into 5.0 tree (msvensson:1.1964) BUG#13029
List-Archive: http://lists.mysql.com/internals/29886
X-Bug: 13029
Message-Id: <20050915074615.BB18C25DF63@blaudden.homeip.net>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1964 05/09/15 09:46:10 msvensson@neptunus.(none) +1 -0
  Bug #13029  YaSSL not compatibile w/ JSSE (Java implementation of SSL)
  -Applied patch from Todd

  extra/yassl/src/ssl.cpp
    1.8 05/09/15 09:46:06 msvensson@neptunus.(none) +15 -3
    Call processReply until clientFinishedComplete or error

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug13029/my50-bug13029

--- 1.7/extra/yassl/src/ssl.cpp	2005-06-16 13:35:02 +02:00
+++ 1.8/extra/yassl/src/ssl.cpp	2005-09-15 09:46:06 +02:00
@@ -171,13 +171,25 @@
         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());