From: msvensson
Date: December 19 2005 4:52pm
Subject: bk commit into 5.0 tree (msvensson:1.1981) BUG#15772
List-Archive: http://lists.mysql.com/commits/267
X-Bug: 15772
Message-Id: <20051219165211.F307620781F@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.1981 05/12/19 17:52:04 msvensson@neptunus.(none) +1 -0
  Bug #15772 Aborted YaSSL connections force threads into busyloops
   - Report error when there is nothing to read after wait.

  extra/yassl/src/handshake.cpp
    1.5 05/12/19 17:51:56 msvensson@neptunus.(none) +5 -1
    Report error if there is nothing to read after a blocking read

# 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_2

--- 1.4/extra/yassl/src/handshake.cpp	2005-06-06 12:52:36 +02:00
+++ 1.5/extra/yassl/src/handshake.cpp	2005-12-19 17:51:56 +01:00
@@ -656,7 +656,11 @@
 {
     ssl.getSocket().wait();                  // wait for input if blocking
     uint ready = ssl.getSocket().get_ready();
-    if (!ready) return buffered;
+    if (!ready) {
+      // Nothing to receive after blocking wait => error
+      ssl.SetError(receive_error);
+      return buffered= null_buffer;
+    }
 
     // add buffered data if its there
     uint buffSz = buffered.get() ? buffered.get()->get_size() : 0;