[svn] select the file descriptor only if no data is pending in SSL buffers.

Submitted by tony@bluetail.com.
Published in <sxslmezocyp.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bec4d66d336bd4be0035e947259ba3e865cb77d..ede9eae03e49a8dfa4bf47b2efe24a9d94db0156 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-15  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * gen_sslfunc.c (ssl_iread): Call select on the file descriptor
+       only if no data is pending in SSL buffers.
+       From tony@bluetail.com.
+
 2002-01-14  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * headers.c (header_get): Strip trailing whitespace from the

diff --git a/src/gen_sslfunc.c b/src/gen_sslfunc.c
index 1f97edcc38b315c083bb8fde959b7e450dee302f..8af78895c62a878d4b4676b86e721bcda7c23043 100644 (file)
--- a/src/gen_sslfunc.c
+++ b/src/gen_sslfunc.c
@@ -221,9 +221,8 @@ ssl_iread (SSL *con, char *buf, int len)
   do
     {
 #ifdef HAVE_SELECT
-      if (opt.timeout)
+      if (opt.timeout && !SSL_pending (con))
        {
-         
          do
            {
              res = select_fd (fd, opt.timeout, 0);