From d36761f4a4dac1f859bfbc12784e6c5a55a5b425 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 25 Feb 2022 19:15:22 +0100 Subject: [PATCH] fcl-net: no ESocketError after closing the connection --- packages/fcl-net/src/ssockets.pp | 5 ++++- packages/fcl-web/src/websocket/fpwebsocket.pp | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/fcl-net/src/ssockets.pp b/packages/fcl-net/src/ssockets.pp index d7b676d018..0dcbb86005 100644 --- a/packages/fcl-net/src/ssockets.pp +++ b/packages/fcl-net/src/ssockets.pp @@ -856,7 +856,10 @@ begin Result:=Nil; NewSocket:=Accept; if (NewSocket<0) then - Raise ESocketError.Create(seAcceptFailed,[Socket,SocketError]); + if not FAccepting then + exit + else + Raise ESocketError.Create(seAcceptFailed,[Socket,SocketError]); If FAccepting and DoConnectQuery(NewSocket) Then Result:=SockToStream(NewSocket) else diff --git a/packages/fcl-web/src/websocket/fpwebsocket.pp b/packages/fcl-web/src/websocket/fpwebsocket.pp index c0dfe99c26..23de629d1c 100644 --- a/packages/fcl-web/src/websocket/fpwebsocket.pp +++ b/packages/fcl-web/src/websocket/fpwebsocket.pp @@ -164,8 +164,6 @@ type {$INTERFACES CORBA} - { TWSTransport } - { IWSTransport } IWSTransport = Interface @@ -1635,7 +1633,7 @@ begin else if ReadMessage then Result:=irOK else - Result:=irClose + Result:=irClose; end; constructor TWSClientConnection.Create(aOwner: TComponent; aTransport: TWSClientTransport; aOptions : TWSOptions);