From 8541ac72d7ec80a36171115501e49dd47bcb1d0d Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Mon, 31 Oct 2016 20:19:25 +0100
Subject: [PATCH] fix(headers): Allow IPv6 Addresses in Host header

---
 src/header/common/host.rs | 44 ++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/header/common/host.rs b/src/header/common/host.rs
index e1be6793e2..df63901321 100644
--- a/src/header/common/host.rs
+++ b/src/header/common/host.rs
@@ -71,18 +71,28 @@ impl FromStr for Host {
     type Err = ::Error;
 
     fn from_str(s: &str) -> ::Result<Host> {
-        let (host_port, res) = domain_to_unicode(s);
-        if res.is_err() {
-            return Err(::Error::Header)
-        }
-        let idx = host_port.rfind(':');
+        let idx = s.rfind(':');
         let port = idx.and_then(
             |idx| s[idx + 1..].parse().ok()
         );
-        let hostname = match idx {
-            None => host_port,
-            Some(idx) => host_port[..idx].to_owned()
+        let hostname_encoded = match port {
+            None => s,
+            Some(_) => &s[..idx.unwrap()]
+        };
+
+        let hostname = if hostname_encoded.starts_with("[") {
+            if !hostname_encoded.ends_with("]") {
+                return Err(::Error::Header)
+            }
+            hostname_encoded.to_owned()
+        } else {
+            let (hostname, res) = domain_to_unicode(hostname_encoded);
+            if res.is_err() {
+                return Err(::Error::Header)
+            }
+            hostname
         };
+
         Ok(Host {
             hostname: hostname,
             port: port
@@ -110,6 +120,24 @@ mod tests {
             hostname: "foo.com".to_owned(),
             port: Some(8080)
         }));
+
+        let host = Header::parse_header([b"foo.com".to_vec()].as_ref());
+        assert_eq!(host.ok(), Some(Host {
+            hostname: "foo.com".to_owned(),
+            port: None
+        }));
+
+        let host = Header::parse_header([b"[::1]:8080".to_vec()].as_ref());
+        assert_eq!(host.ok(), Some(Host {
+            hostname: "[::1]".to_owned(),
+            port: Some(8080)
+        }));
+
+        let host = Header::parse_header([b"[::1]".to_vec()].as_ref());
+        assert_eq!(host.ok(), Some(Host {
+            hostname: "[::1]".to_owned(),
+            port: None
+        }));
     }
 }