From: msvensson
Date: December 16 2005 7:08pm
Subject: bk commit into 5.0 tree (msvensson:1.1980) BUG#15772
List-Archive: http://lists.mysql.com/commits/204
X-Bug: 15772
Message-Id: <20051216190846.B52D120781F@localhost.localdomain>

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.1980 05/12/16 20:08:40 msvensson@neptunus.(none) +1 -0
  Bug #15772  	Aborted YaSSL connections force threads into busyloops
   - Set a limit for number of times that processReply can be called before continuing.
   - This is a workaround for iocntl(FIONREAD) and receive(b, 1, MSG_PEEK) does not detect that the socket has been closed. They shuold return -1

  extra/yassl/src/ssl.cpp
    1.10 05/12/16 20:08:36 msvensson@neptunus.(none) +6 -2
    Limit the number of times processReply is called for a fragmented reponse. This will allow the thread to detect it has been killed.
    

# 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/bug15772/my50-bug15772

--- 1.9/extra/yassl/src/ssl.cpp	2005-12-02 21:40:38 +01:00
+++ 1.10/extra/yassl/src/ssl.cpp	2005-12-16 20:08:36 +01:00
@@ -172,10 +172,12 @@
         ssl->flushBuffer();
 
         // Java Client sends fragmented response
+	int max_loop= 10;
         while (ssl->getStates().getServer() <
-               clientFinishedComplete) {
+               clientFinishedComplete && max_loop) {
             if (ssl->GetError()) break;
             processReply(*ssl);
+	    max_loop--;
         }
     }
     sendChangeCipher(*ssl);
@@ -184,10 +186,12 @@
     if (ssl->getSecurity().get_resuming()) {
 
       // Java Client sends fragmented response
+	int max_loop= 10;
       while (ssl->getStates().getServer() <
-             clientFinishedComplete) {
+             clientFinishedComplete && max_loop) {
           if (ssl->GetError()) break;
           processReply(*ssl);
+	  max_loop--;
       }
     }