* Patch to fix IndexOfHeader (plus some cosmetic changes) from engkin. Bug ID #33680

git-svn-id: trunk@38910 -
This commit is contained in:
michael 2018-05-05 15:09:45 +00:00
parent f9e790aa3f
commit a8e5d89aac

View File

@ -679,7 +679,7 @@ begin
end; end;
if Assigned(FCookies) then if Assigned(FCookies) then
begin begin
L:='Cookie:'; L:='Cookie: ';
For I:=0 to FCookies.Count-1 do For I:=0 to FCookies.Count-1 do
begin begin
If (I>0) then If (I>0) then
@ -1298,13 +1298,18 @@ end;
class procedure TFPCustomHTTPClient.AddHeader(HTTPHeaders: TStrings; class procedure TFPCustomHTTPClient.AddHeader(HTTPHeaders: TStrings;
const AHeader, AValue: String); const AHeader, AValue: String);
Var Var
J: Integer; J: Integer;
S : String;
begin begin
j:=IndexOfHeader(HTTPHeaders,Aheader); J:=IndexOfHeader(HTTPHeaders,Aheader);
S:=AHeader+': '+Avalue;
if (J<>-1) then if (J<>-1) then
HTTPHeaders.Delete(j); HTTPHeaders[j]:=S
HTTPHeaders.Add(AHeader+': '+Avalue); else
HTTPHeaders.Add(S);
end; end;
@ -1315,8 +1320,8 @@ Var
L : Integer; L : Integer;
H : String; H : String;
begin begin
H:=LowerCase(Aheader); H:=LowerCase(Aheader)+':';
l:=Length(AHeader); l:=Length(H);
Result:=HTTPHeaders.Count-1; Result:=HTTPHeaders.Count-1;
While (Result>=0) and ((LowerCase(Copy(HTTPHeaders[Result],1,l)))<>h) do While (Result>=0) and ((LowerCase(Copy(HTTPHeaders[Result],1,l)))<>h) do
Dec(Result); Dec(Result);