Explorar o código

fcl-net: no ESocketError after closing the connection

mattias %!s(int64=3) %!d(string=hai) anos
pai
achega
d36761f4a4

+ 4 - 1
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

+ 1 - 3
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);