---

yaml
---
r: 31655
b: refs/heads/dist-snap
c: 3fe1c70
h: refs/heads/master
i:
  31653: 56321b5
  31651: b8c7a1e
  31647: 09d7ad2
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: dbf58716dfe1dd502ea37d5a613847406a9736c9
+refs/heads/dist-snap: 3fe1c7071d9585f53748d8d0ccb5a06c7b850287
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libstd/net_url.rs

@@ -489,10 +489,17 @@ fn get_authority(rawurl: ~str) ->
         end = i;
     }
 
+    let end = end; // make end immutable so it can be captured
+
+    let host_is_end_plus_one = || {
+        end+1 == len
+            && !['?', '#', '/'].contains(rawurl[end] as char)
+    };
+
     // finish up
     match st {
       start {
-        if end+1 == len {
+        if host_is_end_plus_one() {
             host = str::slice(rawurl, begin, end+1);
         } else {
             host = str::slice(rawurl, begin, end);
@@ -516,7 +523,7 @@ fn get_authority(rawurl: ~str) ->
       }
     }
 
-    let rest = if end+1 == len { ~"" }
+    let rest = if host_is_end_plus_one() { ~"" }
     else { str::slice(rawurl, end, len) };
     return result::ok((userinfo, host, port, rest));
 }
@@ -779,6 +786,15 @@ mod tests {
         assert option::unwrap(copy u.fragment) == ~"something";
     }
 
+    #[test]
+    fn test_url_parse_host_slash() {
+        let urlstr = ~"http://0.42.42.42/";
+        let url = from_str(urlstr).get();
+        #debug("url: %?", url);
+        assert url.host == ~"0.42.42.42";
+        assert url.path == ~"/";
+    }
+
     #[test]
     fn test_no_scheme() {
         assert result::is_err(get_scheme(~"noschemehere.html"));