aboutsummaryrefslogtreecommitdiff
path: root/src/uri.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/uri.rs')
-rw-r--r--src/uri.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/uri.rs b/src/uri.rs
index da706f2..25027af 100644
--- a/src/uri.rs
+++ b/src/uri.rs
@@ -556,7 +556,7 @@ impl Uri {
// RFC describes this as:
// "T.path = merge(Base.path, R.path);"
let mut path = self.path.clone();
- if path.len() > 1 {
+ if self.authority.is_none() || path.len() > 1 {
path.pop();
}
path.extend(
@@ -1458,6 +1458,7 @@ mod tests {
("http://a/b/c/d;p?q", "../../", "http://a").into(),
("http://a/b/c/d;p?q", "../../g", "http://a/g").into(),
// Here are some examples of our own.
+ ("foo", "bar", "bar").into(),
("http://example.com", "foo", "http://example.com/foo").into(),
("http://example.com/", "foo", "http://example.com/foo").into(),
("http://example.com", "foo/", "http://example.com/foo/").into(),