Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -1015,7 +1015,7 @@ namespace Mono.Security {
}
// 5 path
pos = uriString.IndexOfAny (new char[] {'/'});
pos = uriString.IndexOfAny (new char[] {'/', '\\'});
if (unixAbsPath)
pos = -1;
if (pos == -1) {
@@ -1042,6 +1042,8 @@ namespace Mono.Security {
pos = uriString.LastIndexOf (":");
if (unixAbsPath)
pos = -1;
if (pos == 1 && scheme == Uri.UriSchemeFile && Char.IsLetter (uriString [0]))
pos = -1;
if (pos != -1 && pos != (uriString.Length - 1)) {
string portStr = uriString.Remove (0, pos + 1);
if (portStr.Length > 1 && portStr [portStr.Length - 1] != ']') {