From 263c888555de6a56d2408b1f6e1024f1de3ef68c Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 13 Feb 2016 11:47:17 +0000 Subject: [PATCH] * Fix bug ID #28723 git-svn-id: trunk@33094 - --- packages/fcl-net/src/ssockets.pp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/fcl-net/src/ssockets.pp b/packages/fcl-net/src/ssockets.pp index 88f8f558e3..54a4394b5f 100644 --- a/packages/fcl-net/src/ssockets.pp +++ b/packages/fcl-net/src/ssockets.pp @@ -194,6 +194,7 @@ type Protected Procedure Bind; Override; Function Accept : Longint;override; + function GetConnection: TSocketStream; override; Function SockToStream (ASocket : Longint) : TSocketStream;Override; Procedure Close; override; Public @@ -509,11 +510,9 @@ Function TInetServer.GetConnection : TSocketStream; var NewSocket : longint; - l : integer; begin Result:=Nil; - L:=SizeOf(FAddr); NewSocket:=Accept; if (NewSocket<0) then Raise ESocketError.Create(seAcceptFailed,[Socket,SocketError]); @@ -817,6 +816,22 @@ begin (Result as TUnixSocket).FFileName:=FFileName; end; +Function TUnixServer.GetConnection : TSocketStream; + +var + NewSocket : longint; + +begin + Result:=Nil; + NewSocket:=Accept; + if (NewSocket<0) then + Raise ESocketError.Create(seAcceptFailed,[Socket,SocketError]); + If FAccepting and DoConnectQuery(NewSocket) Then + Result:=SockToStream(NewSocket) + else + CloseSocket(NewSocket); +end; + {$endif} { ---------------------------------------------------------------------