When resolving URI inherit userinfo from the base URI

lib/uri.ml

@@ -865,13 +865,15 @@ let resolve schem base uri =
       | Some scheme -> scheme
     )) in
   normalize schem
-    Path.(match scheme uri, host uri with
-    | Some _, _ ->
+    Path.(match scheme uri, userinfo uri, host uri with
+    | Some _, _, _ ->
       {uri with path=remove_dot_segments uri.path}
-    | None, Some _ ->
+    | None, Some _, _
+    | None, _, Some _ ->
       {uri with scheme=base.scheme; path=remove_dot_segments uri.path}
-    | None, None ->
-      let uri = {uri with scheme=base.scheme; host=base.host; port=base.port} in
+    | None, None, None ->
+      let uri = {uri with scheme=base.scheme; userinfo=base.userinfo;
+                          host=base.host; port=base.port} in
       let path_str = path uri in
       if path_str=""
       then { uri with

lib_test/test_runner.ml

@@ -292,6 +292,25 @@ let test_rel_rel_res =
     res >:: test
   ) uri_rel_rel_res
 
+let userinfo_res = [
+    "http://user:[email protected]/foo",
+      ["bar", "http://user:[email protected]/bar";
+       "/", "http://user:[email protected]/";
+      "http://boo:[email protected]/foo", "http://boo:[email protected]/foo";
+      ]
+]
+
+let test_userinfo_res =
+  userinfo_res |> List.map (fun (base,tests) ->
+        let base = Uri.of_string base in
+        List.map (fun (uri,res) ->
+            let uri = Uri.of_string uri in
+            let test () = assert_equal ~printer:(fun l -> l)
+                res (Uri.to_string (Uri.resolve "" base uri)) in
+            res >::test
+        ) tests
+  ) |> List.fold_left List.rev_append []
+
 let generic_uri_norm = [
   "HTTP://example.com/", "http://example.com/";
   "http://example.com/%3a%3f", "http://example.com/:%3F";
@@ -671,6 +690,7 @@ let _ =
     @ test_rel_res
     @ test_file_rel_res
     @ test_rel_rel_res
+    @ test_userinfo_res
     @ test_rel_empty_path_res
     @ test_generic_uri_norm
     @ test_rel_id