paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-04 00:38:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

SSL sockets: propagate socket error on SSL_ERROR_SYSCALL (SSL_ERROR_SYSCALL means an error happened on the underlying socket)

Browse Source
This commit is contained in:
Ondrej Pokorny 2023-08-21 21:31:42 +02:00 committed by Michael Van Canneyt
parent 75338da133
commit 38537fe27f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/openssl/src/opensslsockets.pp
View File

@ -305,6 +305,7 @@ function TOpenSSLSocketHandler.Send(Const Buffer; Count: Integer): Integer;
var var
e: integer; e: integer;
begin begin
FLastError:=0;
FSSLLastError := 0; FSSLLastError := 0;
FSSLLastErrorString:=''; FSSLLastErrorString:='';
repeat repeat
@ -314,7 +315,11 @@ begin
if (E=SSL_ERROR_ZERO_RETURN) then if (E=SSL_ERROR_ZERO_RETURN) then
Result:=0 Result:=0
else if (e<>0) then else if (e<>0) then
begin
FSSLLastError:=e; FSSLLastError:=e;
if e=SSL_ERROR_SYSCALL then
FLastError:=socketerror;
end;
end; end;
function TOpenSSLSocketHandler.Recv(Const Buffer; Count: Integer): Integer; function TOpenSSLSocketHandler.Recv(Const Buffer; Count: Integer): Integer;
@ -322,6 +327,7 @@ function TOpenSSLSocketHandler.Recv(Const Buffer; Count: Integer): Integer;
var var
e: integer; e: integer;
begin begin
FLastError:=0;
FSSLLastError:=0; FSSLLastError:=0;
FSSLLastErrorString:= ''; FSSLLastErrorString:= '';
repeat repeat
@ -333,7 +339,11 @@ begin
if (E=SSL_ERROR_ZERO_RETURN) then if (E=SSL_ERROR_ZERO_RETURN) then
Result:=0 Result:=0
else if (e<>0) then else if (e<>0) then
begin
FSSLLastError:=e; FSSLLastError:=e;
if e=SSL_ERROR_SYSCALL then
FLastError:=socketerror;
end;
end; end;
function TOpenSSLSocketHandler.BytesAvailable: Integer; function TOpenSSLSocketHandler.BytesAvailable: Integer;