diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-01-10 06:44:14 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-01-10 06:44:14 +0000 |
commit | 048d175d5e6aa260a8ae447d85367f68738d49d4 (patch) | |
tree | 6d27a7c8085e6edebfed446b46655cf6ad720f7c | |
parent | abac9a563b09771c21fb36ee751b72d68386964c (diff) | |
download | fpc-048d175d5e6aa260a8ae447d85367f68738d49d4.tar.gz |
--- Merging r37854 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r37854 into '.':
U .
# revisions: 37854
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37943 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/fcl-web/src/base/fphttpclient.pp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/fcl-web/src/base/fphttpclient.pp b/packages/fcl-web/src/base/fphttpclient.pp index 22e4ed7269..a7bf77e59b 100644 --- a/packages/fcl-web/src/base/fphttpclient.pp +++ b/packages/fcl-web/src/base/fphttpclient.pp @@ -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); |