beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AK: Make sure URL retains trailing slash if present in complete_url

Browse source
This commit is contained in:
Conrad Pankoff 2020-05-17 21:41:36 +10:00 committed by Andreas Kling
parent 013cb76d77
commit b5b08fba92
Notes: sideshowbarker 2024-07-19 06:33:35 +09:00 
Author: https://github.com/deoxxa
Commit: https://github.com/SerenityOS/serenity/commit/b5b08fba927
Pull-request: https://github.com/SerenityOS/serenity/pull/2261
Reviewed-by: https://github.com/alimpfard
Reviewed-by: https://github.com/bugaevc
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AK/Tests/TestURL.cpp
View file

@ -157,4 +157,12 @@ TEST_CASE(about_url)
EXPECT_EQ(url.to_string(), "about:blank");
}
TEST_CASE(trailing_slash_with_complete_url)
{
EXPECT_EQ(URL("http://a/b/").complete_url("c/").to_string(), "http://a/b/c/");
EXPECT_EQ(URL("http://a/b/").complete_url("c").to_string(), "http://a/b/c");
EXPECT_EQ(URL("http://a/b").complete_url("c/").to_string(), "http://a/c/");
EXPECT_EQ(URL("http://a/b").complete_url("c").to_string(), "http://a/c");
}
TEST_MAIN(URL)

10
AK/URL.cpp
View file

@ -323,8 +323,16 @@ URL URL::complete_url(const String& string) const
auto built = builder.to_string();
fspath = FileSystemPath(built);
built = fspath.string();
if (string.ends_with('/') && !built.ends_with('/')) {
builder.clear();
builder.append(built);
builder.append('/');
built = builder.to_string();
}
url = *this;
url.set_path(fspath.string());
url.set_path(built);
return url;
}