Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@ -253,7 +253,10 @@ namespace System.Web.UI.HtmlControls
if (cookieless) {
Uri current_uri = new Uri ("http://host" + current_path);
Uri fp_uri = new Uri ("http://host" + file_path);
//Determine if the file_path is rooted (ie starts with a '/')
//and inject a '/' into the Uri string accordingly.
string separator = file_path[0] == '/' ? "" : "/";
Uri fp_uri = new Uri ("http://host" + separator + file_path);
action = fp_uri.MakeRelative (current_uri);
} else
action = current_path;