Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -106,7 +106,7 @@ namespace System.Net
#if MONOTOUCH
[System.Runtime.InteropServices.DllImport ("__Internal")]
static extern void monotouch_start_wwan (string uri);
static extern void xamarin_start_wwan (string uri);
#endif
internal ChunkStream ChunkStream {
@ -171,7 +171,7 @@ namespace System.Net
if (hostEntry == null) {
#if MONOTOUCH
monotouch_start_wwan (sPoint.Address.ToString ());
xamarin_start_wwan (sPoint.Address.ToString ());
hostEntry = sPoint.HostEntry;
if (hostEntry == null) {
#endif
@ -1067,6 +1067,8 @@ namespace System.Net
Stream s = null;
lock (this) {
if (status == WebExceptionStatus.RequestCanceled)
return true;
if (Data.request != request)
throw new ObjectDisposedException (typeof (NetworkStream).FullName);
if (nstream == null)