paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-25 16:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Minor improvements of EncodeUri. Fixes issue #40455

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-10-03 08:59:35 +02:00
parent e11838c5bd
commit 123481aa8d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/fcl-base/src/uriparser.pp
View File

@ -101,16 +101,16 @@ end;
function EncodeURI(const URI: TURI): String;
// ! if no scheme then first colon in path should be escaped
begin
SetLength(Result, 0);
if Length(URI.Protocol) > 0 then
Result := '';
if URI.Protocol <> '' then
Result := LowerCase(URI.Protocol) + ':';
if URI.HasAuthority then
begin
Result := Result + '//';
if Length(URI.Username) > 0 then
if URI.Username <> '' then
begin
Result := Result + URI.Username;
if Length(URI.Password) > 0 then
if URI.Password <> '' then
Result := Result + ':' + URI.Password;
Result := Result + '@';
end;
@ -119,15 +119,15 @@ begin
if URI.Port <> 0 then
Result := Result + ':' + IntToStr(URI.Port);
Result := Result + Escape(URI.Path, ValidPathChars);
if Length(URI.Document) > 0 then
if URI.Document <> '' then
begin
if (Length(URI.Path) > 0) and ((Length(Result) = 0) or (Result[Length(Result)] <> '/')) then
if (URI.Path <> '') and ((Result = '') or (Result[Length(Result)] <> '/')) then
Result := Result + '/';
Result := Result + Escape(URI.Document, ValidPathChars);
end;
if Length(URI.Params) > 0 then
if URI.Params <> '' then
Result := Result + '?' + Escape(URI.Params, ValidPathChars);
if Length(URI.Bookmark) > 0 then
if URI.Bookmark <> '' then
Result := Result + '#' + Escape(URI.Bookmark, ValidPathChars);
end;
@ -300,7 +300,7 @@ begin
SetLength(Authority, i - 1);
// Extract username and password
if Length(Authority)>0 then
if Authority <> '' then
begin
i := Pos(':', Authority);
if i = 0 then