Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -203,9 +203,7 @@ namespace System.Web.Util {
return "/";
string str = String.Join ("/", parts, 0, dest);
#if NET_2_0
str = RemoveDoubleSlashes (str);
#endif
if (isRooted)
str = "/" + str;
if (endsWithSlash)
@ -222,17 +220,12 @@ namespace System.Web.Util {
if (last > 0) {
if (last < url.Length)
last++;
#if NET_2_0
return RemoveDoubleSlashes (url.Substring (0, last));
#else
return url.Substring (0, last);
#endif
}
return "/";
}
#if NET_2_0
public static string RemoveDoubleSlashes (string input)
{
// MS VirtualPathUtility removes duplicate '/'
@ -264,7 +257,6 @@ namespace System.Web.Util {
return sb.ToString ();
}
#endif
public static string GetFile (string url)
{