bk commit into 5.0 tree (msvensson:1.2236)

[msvensson]

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@stripped, 2006-07-17 11:27:12+02:00, msvensson@shellback.(none) +3 -0
  Merge shellback.(none):/home/msvensson/mysql/my50-yassl
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2164.5.2

  extra/yassl/src/handshake.cpp@stripped, 2006-07-17 11:27:08+02:00,
msvensson@shellback.(none) +0 -4
    Manual merge
    MERGE: 1.10.1.1

  extra/yassl/src/socket_wrapper.cpp@stripped, 2006-07-17 11:25:31+02:00,
msvensson@shellback.(none) +0 -11
    Auto merged
    MERGE: 1.10.1.1

  extra/yassl/taocrypt/include/runtime.hpp@stripped, 2006-07-17 11:25:32+02:00,
msvensson@shellback.(none) +0 -3
    Auto merged
    MERGE: 1.14.1.1

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.11/extra/yassl/src/handshake.cpp	2006-07-17 11:27:16 +02:00
+++ 1.12/extra/yassl/src/handshake.cpp	2006-07-17 11:27:16 +02:00
@@ -9,6 +9,10 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ * There are special exceptions to the terms and conditions of the GPL as it
+ * is applied to yaSSL. View the full text of the exception in the file
+ * FLOSS-EXCEPTIONS in the directory of this software distribution.
+ *
  * yaSSL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -912,7 +916,7 @@
 
 
 // process input data
-int receiveData(SSL& ssl, Data& data)
+int receiveData(SSL& ssl, Data& data, bool peek)
 {
     if (ssl.GetError() == YasslError(SSL_ERROR_WANT_READ))
         ssl.SetError(no_error);
@@ -922,9 +926,13 @@
 
     if (!ssl.bufferedData())
         processReply(ssl);
+
+    if (peek)
+        ssl.PeekData(data);
+    else
     ssl.fillData(data);
-    ssl.useLog().ShowData(data.get_length());
 
+    ssl.useLog().ShowData(data.get_length());
     if (ssl.GetError()) return -1;
 
     if (data.get_length() == 0 && ssl.getSocket().WouldBlock()) {

--- 1.11/extra/yassl/src/socket_wrapper.cpp	2006-07-17 11:27:16 +02:00
+++ 1.12/extra/yassl/src/socket_wrapper.cpp	2006-07-17 11:27:16 +02:00
@@ -9,6 +9,10 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ * There are special exceptions to the terms and conditions of the GPL as it
+ * is applied to yaSSL. View the full text of the exception in the file
+ * FLOSS-EXCEPTIONS in the directory of this software distribution.
+ *
  * yaSSL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

--- 1.15/extra/yassl/taocrypt/include/runtime.hpp	2006-07-17 11:27:16 +02:00
+++ 1.16/extra/yassl/taocrypt/include/runtime.hpp	2006-07-17 11:27:16 +02:00
@@ -9,6 +9,10 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
+ * There are special exceptions to the terms and conditions of the GPL as it
+ * is applied to yaSSL. View the full text of the exception in the file
+ * FLOSS-EXCEPTIONS in the directory of this software distribution.
+ *
  * yaSSL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the