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

Ignore exceptions

Browse Source
This commit is contained in:
Ondrej Pokorny 2021-08-14 06:17:46 +02:00 committed by Michaël Van Canneyt
parent da10b8141c
commit c4e2029179
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-net/src/ssockets.pp
View File

@ -497,7 +497,10 @@ begin
IOTimeout := TimeOut;
FHandler.Recv(B,0);
Result := FHandler.FLastError=0;
IOTimeout := lTM;
try
IOTimeout := lTM;
except
end;
end;
Function TSocketStream.Read (Var Buffer; Count : Longint) : longint;

6
packages/fcl-web/src/base/fphttpserver.pp
View File

@ -656,11 +656,11 @@ begin
try
repeat
FConnection.HandleRequest;
if Connection.EnableKeepAlive and Connection.KeepAlive
if not Terminated and Connection.EnableKeepAlive and Connection.KeepAlive
and not Connection.Socket.CanRead(Connection.KeepAliveTimeout) then
break;
FConnection.HandleRequest;
until not (FConnection.EnableKeepAlive and FConnection.KeepAlive and (FConnection.Socket.LastError=0));
until not (Terminated and FConnection.EnableKeepAlive and FConnection.KeepAlive and (FConnection.Socket.LastError=0));
finally
FreeAndNil(FConnection);
if Assigned(FThreadList) then
@ -988,7 +988,7 @@ begin
try
for I:= ThreadList.Count-1 downto 0 do
try
CloseSocket(TFPHTTPConnectionThread(ThreadList[I]).Connection.Socket.Handle);
CloseSocket(TFPHTTPConnectionThread(ThreadList[I]).Connection.Socket.Handle);
except
// ignore exceptions during CloseSocket
end