---

yaml
---
r: 20893
b: refs/heads/snap-stage3
c: 1e3143b
h: refs/heads/master
i:
  20891: b228e15
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 03330baf9ca15d88e58753167b1eb40ca03cba78
+refs/heads/snap-stage3: 1e3143b34e66ca5157b03d3658d64d7c01563186
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -537,7 +537,8 @@ fn get_path(rawurl: ~str, authority : bool) ->
     for str::each_chari(rawurl) |i,c| {
         match c {
           'A' to 'Z' | 'a' to 'z' | '0' to '9' | '&' |'\'' | '(' | ')' | '.'
-          | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '=' => {
+          | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '='
+          | '_' => {
             again;
           }
           '?' | '#' => {
@@ -795,6 +796,14 @@ mod tests {
         assert url.path == ~"/";
     }
 
+    #[test]
+    fn test_url_with_underscores() {
+        let urlstr = ~"http://dotcom.com/file_name.html";
+        let url = from_str(urlstr).get();
+        #debug("url: %?", url);
+        assert url.path == ~"/file_name.html";
+    }
+
     #[test]
     fn test_no_scheme() {
         assert result::is_err(get_scheme(~"noschemehere.html"));