Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@@ -60,6 +60,8 @@ namespace System.Net
static IWebProxy defaultWebProxy;
static RequestCachePolicy defaultCachePolicy;
internal const int DefaultTimeout = 100000;
static WebRequest ()
{
#if MOBILE
@@ -454,12 +456,11 @@ namespace System.Net
void ISerializable.GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
{
throw new NotSupportedException ();
GetObjectData(serializationInfo, streamingContext);
}
protected virtual void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
{
throw GetMustImplement ();
}
public static bool RegisterPrefix (string prefix, IWebRequestCreate creator)
@@ -543,6 +544,5 @@ namespace System.Net
{
return Task<WebResponse>.Factory.FromAsync (BeginGetResponse, EndGetResponse, null);
}
}
}