Skip to content

Fix issues with thread leakage #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grahamegrieve wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issues with thread leakage #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde13f5
Fix issues with thread leakage
grahamegrieve Oct 21, 2020
075554b
update IdHl7 so the thread uses TIdThread not TThread directly
grahamegrieve Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Lib/Protocols/IdCustomHTTPServer.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ interface
Id_TId_HTTPServer_ParseParams = True;
Id_TId_HTTPServer_SessionState = False;
Id_TId_HTTPSessionTimeOut = 0;
Id_TId_HTTPConnectionTimeOut = -1;
Id_TId_HTTPAutoStartSession = False;

Id_TId_HTTPMaximumHeaderLineCount = 1024;
Expand Down Expand Up @@ -420,6 +421,7 @@ TIdCustomHTTPServer = class(TIdCustomTCPServer)
FImplicitSessionList: Boolean;
FSessionState: Boolean;
FSessionTimeOut: Integer;
FConnectionTimeOut : Integer;
//
FOnCreatePostStream: TIdHTTPCreatePostStream;
FOnDoneWithPostStream: TIdHTTPDoneWithPostStream;
Expand Down Expand Up @@ -499,6 +501,7 @@ TIdCustomHTTPServer = class(TIdCustomTCPServer)
property ServerSoftware: string read FServerSoftware write FServerSoftware;
property SessionState: Boolean read FSessionState write SetSessionState default Id_TId_HTTPServer_SessionState;
property SessionTimeOut: Integer read FSessionTimeOut write FSessionTimeOut default Id_TId_HTTPSessionTimeOut;
property ConnectionTimeOut : Integer read FConnectionTimeOut write FConnectionTimeOut default Id_TId_HTTPConnectionTimeOut;
property SessionIDCookieName: string read FSessionIDCookieName write SetSessionIDCookieName stored IsSessionIDCookieNameStored;
//
property OnCommandError: TIdHTTPCommandError read FOnCommandError write FOnCommandError;
Expand Down Expand Up @@ -660,9 +663,9 @@ function DecodeHTTPCommand(const ACmd: string): THTTPCommandType;
procedure Run; override;
end; // class

function InternalReadLn(AIOHandler: TIdIOHandler): String;
function InternalReadLn(AIOHandler: TIdIOHandler; ATimeout : Integer): String;
begin
Result := AIOHandler.ReadLn;
Result := AIOHandler.ReadLn(LF, ATimeout);
if AIOHandler.ReadLnTimedout then begin
raise EIdReadTimeout.Create(RSReadTimeout);
end;
Expand Down Expand Up @@ -903,6 +906,7 @@ procedure TIdCustomHTTPServer.InitComponent;
FKeepAlive := Id_TId_HTTPServer_KeepAlive;
FMaximumHeaderLineCount := Id_TId_HTTPMaximumHeaderLineCount;
FSessionIDCookieName := GSessionIDCookie;
FConnectionTimeOut := Id_TId_HTTPConnectionTimeOut;
end;

// under ARC, all weak references to a freed object get nil'ed automatically
Expand Down Expand Up @@ -1210,7 +1214,7 @@ function TIdCustomHTTPServer.DoExecute(AContext:TIdContext): boolean;
// not start at Position 0.
LRequestInfo.PostStream.Position := 0;
repeat
S := InternalReadLn(LIOHandler);
S := InternalReadLn(LIOHandler, FConnectionTimeout);
I := IndyPos(';', S); {do not localize}
if I > 0 then begin
S := Copy(S, 1, I - 1);
Expand All @@ -1220,10 +1224,10 @@ function TIdCustomHTTPServer.DoExecute(AContext:TIdContext): boolean;
Break;
end;
LIOHandler.ReadStream(LRequestInfo.PostStream, Size);
InternalReadLn(LIOHandler); // CRLF at end of chunk data
InternalReadLn(LIOHandler, FConnectionTimeout); // CRLF at end of chunk data
until False;
// skip trailer headers
repeat until InternalReadLn(LIOHandler) = '';
repeat until InternalReadLn(LIOHandler, FConnectionTimeout) = '';
// TODO: seek back to the original Position where CreatePostStream()
// left it, not all the way back to Position 0.
LRequestInfo.PostStream.Position := 0;
Expand Down Expand Up @@ -1281,7 +1285,7 @@ function TIdCustomHTTPServer.DoExecute(AContext:TIdContext): boolean;
try
LConn := AContext.Connection;
repeat
LInputLine := InternalReadLn(LConn.IOHandler);
LInputLine := InternalReadLn(LConn.IOHandler, FConnectionTimeout);
i := RPos(' ', LInputLine, -1); {Do not Localize}
if i = 0 then begin
raise EIdHTTPErrorParsingCommand.Create(RSHTTPErrorParsingCommand);
Expand Down
7 changes: 4 additions & 3 deletions Lib/Protocols/IdHL7.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ interface
IdTCPClient,
IdTCPConnection,
IdTCPServer,
IdThread,
SysUtils;

const
Expand Down Expand Up @@ -198,12 +199,12 @@ EHL7CommunicationError = class(EIdException)
TIdHL7 = class;
TIdHL7ConnCountEvent = procedure (ASender : TIdHL7; AConnCount : integer) of object;

TIdHL7ClientThread = class(TThread)
TIdHL7ClientThread = class(TIdThread)
Protected
FClient: TIdTCPClient;
FCloseEvent: TIdLocalEvent;
FOwner: TIdHL7;
procedure Execute; Override;
procedure Run; Override;
procedure PollStack;
Public
constructor Create(aOwner: TIdHL7);
Expand Down Expand Up @@ -1186,7 +1187,7 @@ procedure TIdHL7ClientThread.PollStack;
until Terminated or not FClient.Connected;
end;

procedure TIdHL7ClientThread.Execute;
procedure TIdHL7ClientThread.Run;
var
LRecTime: TDateTime;
begin
Expand Down