Skip to content

Commit 2e7979d

Browse files
authored
Merge pull request #116 from acgubamg/dev
Fixed #115
2 parents 99b27e8 + 560cb6e commit 2e7979d

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/base/RALClient.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ procedure TRALClientHTTP.BeforeSendUrl(ARoute: StringRAL;
542542
vErrorCode := AResponse.ErrorCode;
543543
end;
544544

545-
if vErrorCode <> 0 then
545+
if (vErrorCode <> 0) and (Parent.BaseURL.Count > 0) then
546546
FIndexUrl := (FIndexUrl + 1) mod Parent.BaseURL.Count;
547547

548548
vConta := vConta + 1;

src/engine/netHTTP/RALnetHTTPClient.pas

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ procedure TRALnetHTTPClientHTTP.SendUrl(AURL: StringRAL; ARequest: TRALRequest;
7777
begin
7878
AResponse.Params.CompressType := ctNone;
7979
AResponse.Params.CriptoOptions.CriptType := crNone;
80-
AResponse.ResponseText := AMessage;
81-
AResponse.StatusCode := vResponse.GetStatusCode;
80+
AResponse.ResponseText := AMessage;
81+
if vResponse <> nil then // Antonio c Gomes
82+
AResponse.StatusCode := vResponse.GetStatusCode
83+
else
84+
AResponse.StatusCode := ACode; // Antonio c Gomes
8285
AResponse.ErrorCode := ACode;
8386
end;
8487

@@ -163,21 +166,23 @@ procedure TRALnetHTTPClientHTTP.SendUrl(AURL: StringRAL; ARequest: TRALRequest;
163166
amOPTIONS:
164167
vResponse := FHttp.Options(AURL, nil, vHeaders);
165168
end;
166-
167-
for vInt := 0 to Pred(Length(vResponse.Headers)) do
168-
AResponse.AddHeader(vResponse.Headers[vInt].Name, vResponse.Headers[vInt].Value);
169-
170-
AResponse.ContentEncoding := vResponse.ContentEncoding;
171-
AResponse.Params.CompressType := AResponse.ContentCompress;
172-
169+
170+
AResponse.Params.CompressType := AResponse.ContentCompress;
173171
AResponse.ContentEncription := AResponse.ParamByName('Content-Encription').AsString;
174172
AResponse.Params.CriptoOptions.CriptType := AResponse.ContentCripto;
173+
AResponse.ContentDisposition := AResponse.ParamByName('Content-Disposition').AsString;
175174
AResponse.Params.CriptoOptions.Key := Parent.CriptoOptions.Key;
176175

177-
AResponse.ContentType := vResponse.MimeType;
178-
AResponse.ContentDisposition := AResponse.ParamByName('Content-Disposition').AsString;
179-
AResponse.StatusCode := vResponse.GetStatusCode;
180-
AResponse.ResponseStream := vResponse.ContentStream;
176+
if vResponse <> nil then // Antonio c Gomes AV
177+
begin
178+
for vInt := 0 to Pred(Length(vResponse.Headers)) do
179+
AResponse.AddHeader(vResponse.Headers[vInt].Name, vResponse.Headers[vInt].Value);
180+
181+
AResponse.ContentEncoding := vResponse.ContentEncoding;
182+
AResponse.ContentType := vResponse.MimeType;
183+
AResponse.StatusCode := vResponse.GetStatusCode;
184+
AResponse.ResponseStream := vResponse.ContentStream;
185+
end;
181186
except
182187
on e : ENetHTTPClientException do begin
183188
vErroCode := -1;

0 commit comments

Comments
 (0)