mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 20:22:14 +02:00
parent
15f6ec9632
commit
35c3510335
2 changed files with 8 additions and 2 deletions
|
@ -72,8 +72,8 @@ func URLJoin(base string, elems ...string) string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
joinedURL := baseURL.ResolveReference(argURL).String()
|
joinedURL := baseURL.ResolveReference(argURL).String()
|
||||||
if !baseURL.IsAbs() {
|
if !baseURL.IsAbs() && !strings.HasPrefix(base, "/") {
|
||||||
return joinedURL[1:] // Removing leading '/'
|
return joinedURL[1:] // Removing leading '/' if needed
|
||||||
}
|
}
|
||||||
return joinedURL
|
return joinedURL
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,12 @@ func TestURLJoin(t *testing.T) {
|
||||||
"a/", "b/c/", "/../d/"),
|
"a/", "b/c/", "/../d/"),
|
||||||
newTest("https://try.gitea.io/a/b/c#d",
|
newTest("https://try.gitea.io/a/b/c#d",
|
||||||
"https://try.gitea.io", "a/b", "c#d"),
|
"https://try.gitea.io", "a/b", "c#d"),
|
||||||
|
newTest("/a/b/d",
|
||||||
|
"/a/", "b/c/", "/../d/"),
|
||||||
|
newTest("/a/b/c",
|
||||||
|
"/a", "b/c/"),
|
||||||
|
newTest("/a/b/c#hash",
|
||||||
|
"/a", "b/c#hash"),
|
||||||
} {
|
} {
|
||||||
assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
|
assert.Equal(t, test.Expected, URLJoin(test.Base, test.Elements...))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue