mirror of
https://github.com/dani-garcia/vaultwarden
synced 2024-11-26 05:40:18 +00:00
Merge pull request #1010 from jjlin/admin-url
Avoid double-slashes in the admin URL
This commit is contained in:
commit
b03698fadb
1 changed files with 3 additions and 1 deletions
|
@ -63,7 +63,9 @@ fn admin_path() -> String {
|
||||||
/// Used for `Location` response headers, which must specify an absolute URI
|
/// Used for `Location` response headers, which must specify an absolute URI
|
||||||
/// (see https://tools.ietf.org/html/rfc2616#section-14.30).
|
/// (see https://tools.ietf.org/html/rfc2616#section-14.30).
|
||||||
fn admin_url() -> String {
|
fn admin_url() -> String {
|
||||||
format!("{}{}", CONFIG.domain(), ADMIN_PATH)
|
// Don't use CONFIG.domain() directly, since the user may want to keep a
|
||||||
|
// trailing slash there, particularly when running under a subpath.
|
||||||
|
format!("{}{}{}", CONFIG.domain_origin(), CONFIG.domain_path(), ADMIN_PATH)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/", rank = 2)]
|
#[get("/", rank = 2)]
|
||||||
|
|
Loading…
Reference in a new issue