From 9503adeb568ac76a02ea898392f65492e2eb79eb Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Tue, 22 Jan 2019 11:22:15 -0800
Subject: [PATCH] Fix Uri::host to include brackets of IPv6 literals (#292)

---
 src/uri/authority.rs |  3 ++-
 src/uri/tests.rs     | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/uri/authority.rs b/src/uri/authority.rs
index 86e8a3c..724712c 100644
--- a/src/uri/authority.rs
+++ b/src/uri/authority.rs
@@ -497,7 +497,8 @@ fn host(auth: &str) -> &str {
     if host_port.as_bytes()[0] == b'[' {
         let i = host_port.find(']')
             .expect("parsing should validate brackets");
-        &host_port[1..i]
+        // ..= ranges aren't available in 1.20, our minimum Rust version...
+        &host_port[0 .. i + 1]
     } else {
         host_port.split(':')
             .next()
diff --git a/src/uri/tests.rs b/src/uri/tests.rs
index f580e89..70f63a6 100644
--- a/src/uri/tests.rs
+++ b/src/uri/tests.rs
@@ -298,7 +298,7 @@ test_parse! {
 
     scheme_part = part!("http"),
     authority_part = part!("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
-    host = Some("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
+    host = Some("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
     path = "/",
     query = None,
     port_part = None,
@@ -311,7 +311,7 @@ test_parse! {
 
     scheme_part = part!("http"),
     authority_part = part!("[::1]"),
-    host = Some("::1"),
+    host = Some("[::1]"),
     path = "/",
     query = None,
     port_part = None,
@@ -324,7 +324,7 @@ test_parse! {
 
     scheme_part = part!("http"),
     authority_part = part!("[::]"),
-    host = Some("::"),
+    host = Some("[::]"),
     path = "/",
     query = None,
     port_part = None,
@@ -337,7 +337,7 @@ test_parse! {
 
     scheme_part = part!("http"),
     authority_part = part!("[2001:db8::2:1]"),
-    host = Some("2001:db8::2:1"),
+    host = Some("[2001:db8::2:1]"),
     path = "/",
     query = None,
     port_part = None,
@@ -350,7 +350,7 @@ test_parse! {
 
     scheme_part = part!("http"),
     authority_part = part!("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:8008"),
-    host = Some("2001:0db8:85a3:0000:0000:8a2e:0370:7334"),
+    host = Some("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]"),
     path = "/",
     query = None,
     port_part = Port::from_str("8008").ok(),