From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 29 Dec 2002 16:27:31 +0000 (+0000)
Subject: return -1 even if SSL_pending() doesn't return non-zero, as we don't really
X-Git-Tag: curl-7_10_3~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b4f92130f74a4efe08c119d7dd41f10a011eb1c;p=curl

return -1 even if SSL_pending() doesn't return non-zero, as we don't really
care how many bytes that is readable NOW. Philippe Raoult reported the
bug in 7.10.3-pre3.
---

diff --git a/lib/sendf.c b/lib/sendf.c
index ed36ea95d..add8af9ef 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -347,10 +347,8 @@ int Curl_read(struct connectdata *conn,
         break;
       case SSL_ERROR_WANT_READ:
       case SSL_ERROR_WANT_WRITE:
-        /* if there's data pending, then we re-invoke SSL_read() */
-        if(SSL_pending(conn->ssl.handle))
-          return -1; /* basicly EWOULDBLOCK */
-        break;
+        /* there's data pending, re-invoke SSL_read() */
+        return -1; /* basicly EWOULDBLOCK */
       default:
         failf(conn->data, "SSL read error: %d", err);
         return CURLE_RECV_ERROR;