paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 13:49:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* More clear variable names

Browse Source
This commit is contained in:
Michaël Van Canneyt 2021-08-29 18:13:59 +02:00
parent cb05049c4f
commit 35c45dfbe5
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/fcl-web/src/base/fphttpclient.pp
View File

@ -1401,14 +1401,14 @@ Procedure TFPCustomHTTPClient.DoKeepConnectionRequest(const AURI: TURI;
const AAllowedResponseCodes: array of Integer; const AAllowedResponseCodes: array of Integer;
AHeadersOnly, AIsHttps: Boolean); AHeadersOnly, AIsHttps: Boolean);
Var Var
T: Boolean; SkipReconnect: Boolean;
CHost: string; CHost: string;
CPort: Word; CPort: Word;
A: Integer; ACount: Integer;
begin begin
ExtractHostPort(AURI, CHost, CPort); ExtractHostPort(AURI, CHost, CPort);
T := False; SkipReconnect := False;
A := 0; ACount := 0;
Repeat Repeat
If Not IsConnected Then If Not IsConnected Then
ConnectToServer(CHost,CPort,AIsHttps); ConnectToServer(CHost,CPort,AIsHttps);
@ -1419,32 +1419,32 @@ begin
SendRequest(AMethod,AURI); SendRequest(AMethod,AURI);
if Terminated then if Terminated then
break; break;
T := ReadResponse(AStream,AAllowedResponseCodes,AHeadersOnly); SkipReconnect := ReadResponse(AStream,AAllowedResponseCodes,AHeadersOnly);
except except
on E: EHTTPClientSocket do on E: EHTTPClientSocket do
begin begin
if ((FKeepConnectionReconnectLimit>=0) and (A>=KeepConnectionReconnectLimit)) then if ((FKeepConnectionReconnectLimit>=0) and (aCount>=KeepConnectionReconnectLimit)) then
raise // reconnect limit is reached -> reraise raise // reconnect limit is reached -> reraise
else else
begin begin
// failed socket operations raise exceptions - e.g. if ReadString() fails // failed socket operations raise exceptions - e.g. if ReadString() fails
// this can be due to a closed keep-alive connection by the server // this can be due to a closed keep-alive connection by the server
// -> try to reconnect // -> try to reconnect
T:=False; SkipReconnect:=False;
end; end;
end; end;
end; end;
if (FKeepConnectionReconnectLimit>=0) and (A>=KeepConnectionReconnectLimit) then if (FKeepConnectionReconnectLimit>=0) and (ACount>=KeepConnectionReconnectLimit) then
break; // reconnect limit is reached -> exit break; // reconnect limit is reached -> exit
If Not T and Not Terminated Then If Not SkipReconnect and Not Terminated Then
ReconnectToServer(CHost,CPort,AIsHttps); ReconnectToServer(CHost,CPort,AIsHttps);
Inc(A); Inc(ACount);
Finally Finally
// On terminate, we close the request // On terminate, we close the request
If HasConnectionClose or Terminated Then If HasConnectionClose or Terminated Then
DisconnectFromServer; DisconnectFromServer;
End; End;
Until T or Terminated; Until SkipReconnect or Terminated;
end; end;
Procedure TFPCustomHTTPClient.DoMethod(Const AMethod, AURL: String; Procedure TFPCustomHTTPClient.DoMethod(Const AMethod, AURL: String;