mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.8.0.73

Browse Source 
Former-commit-id: d18deab1b47cfd3ad8cba82b3f37d00eec2170af
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-12-10 18:00:56 +00:00
parent bceda29824
commit 73ee7591e8
1043 changed files with 16271 additions and 22080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System/System.Net/HttpWebRequest.cs
View File

@ -114,7 +114,7 @@ namespace System.Net
static RequestCachePolicy defaultCachePolicy;
int readWriteTimeout = 300000; // ms
#if SECURITY_DEP
MonoTlsProvider tlsProvider;
MobileTlsProvider tlsProvider;
MonoTlsSettings tlsSettings;
#endif
ServerCertValidationCallback certValidationCallback;
@ -166,7 +166,7 @@ namespace System.Net
}
#if SECURITY_DEP
internal HttpWebRequest (Uri uri, MonoTlsProvider tlsProvider, MonoTlsSettings settings = null)
internal HttpWebRequest (Uri uri, MobileTlsProvider tlsProvider, MonoTlsSettings settings = null)
: this (uri)
{
this.tlsProvider = tlsProvider;
@ -265,7 +265,7 @@ namespace System.Net
}
#if SECURITY_DEP
internal MonoTlsProvider TlsProvider {
internal MobileTlsProvider TlsProvider {
get { return tlsProvider; }
}

5
mcs/class/System/System.Net/ServicePoint.cs
View File

@ -392,11 +392,6 @@ namespace System.Net
return true;
}
}
internal Socket GetConnection(PooledStream PooledStream, object owner, bool async, out IPAddress address, ref Socket abortSocket, ref Socket abortSocket6)
{
throw new NotImplementedException ();
}
}
}

6
mcs/class/System/System.Net/ServicePoint.platformnotsupported.cs
View File

@ -117,11 +117,5 @@ namespace System.Net
public X509Certificate ClientCertificate {
get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
}
// For reference source
internal Socket GetConnection(PooledStream PooledStream, object owner, bool async, out IPAddress address, ref Socket abortSocket, ref Socket abortSocket6)
{
throw new NotImplementedException ();
}
}
}

16
mcs/class/System/System.Net/WebConnection.cs
View File

@ -166,7 +166,21 @@ namespace System.Net
} else {
try {
operation.ThrowIfDisposed (cancellationToken);
await socket.ConnectAsync (remote).ConfigureAwait (false);
/*
* Socket.Tasks.cs from CoreFX introduces a new internal
* BeginConnect(EndPoint) overload, which will replace
* the one we're using from SocketTaskExtensions.cs.
*
* Our implementation of Socket.BeginConnect() does not
* invoke the callback when the request failed synchronously.
*
* Explicitly use our implementation from SocketTaskExtensions.cs here.
*/
await Task.Factory.FromAsync (
(targetEndPoint, callback, state) => ((Socket)state).BeginConnect (targetEndPoint, callback, state),
asyncResult => ((Socket)asyncResult.AsyncState).EndConnect (asyncResult),
remote, socket).ConfigureAwait (false);
} catch (ObjectDisposedException) {
throw;
} catch (Exception exc) {