--- Merging r37854 into '.':

U    packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r37854 into '.':
 U   .

# revisions: 37854

git-svn-id: branches/fixes_3_0@37943 -
This commit is contained in:
marco 2018-01-10 06:44:14 +00:00
parent 4d7695bfaf
commit 297bf2fbfa

View File

@ -55,6 +55,7 @@ Type
FHTTPClient : TFPCustomHTTPClient;
Protected
Function GetProxyHeaders : String; virtual;
Function GetOwner: TPersistent; override;
Property HTTPClient : TFPCustomHTTPClient Read FHTTPClient;
Public
Procedure Assign(Source: TPersistent); override;
@ -454,7 +455,12 @@ function TProxyData.GetProxyHeaders: String;
begin
Result:='';
if (UserName<>'') then
Result:='Proxy-Authorization: Basic ' + EncodeStringBase64(UserName+':'+UserName);
Result:='Proxy-Authorization: Basic ' + EncodeStringBase64(UserName+':'+Password);
end;
function TProxyData.GetOwner: TPersistent;
begin
Result:=FHTTPClient;
end;
procedure TProxyData.Assign(Source: TPersistent);