* Merging revisions r43693 from trunk:

    ------------------------------------------------------------------------
    r43693 | michael | 2019-12-15 18:13:08 +0100 (Sun, 15 Dec 2019) | 1 line
    
    * Fix bug #36443, patch from Andrew H. Allow non-blocking read
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43728 -

packages/openssl/src/opensslsockets.pp

@@ -298,6 +298,8 @@ begin
   repeat
     Result:=FSSL.Read(@Buffer ,Count);
     e:=FSSL.GetError(Result);
+    if (e=SSL_ERROR_WANT_READ) and (Socket.IOTimeout>0) then
+      e:=SSL_ERROR_ZERO_RETURN;
   until Not (e in [SSL_ERROR_WANT_READ,SSL_ERROR_WANT_WRITE]);
   if (E=SSL_ERROR_ZERO_RETURN) then
     Result:=0