Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -143,9 +143,6 @@ namespace System.Net.Sockets
}
#if !NET_2_1 || MOBILE
#if TARGET_JVM
[MonoNotSupported ("Not supported since Socket.ReceiveTimeout is not supported")]
#endif
public override int ReadTimeout
{
get {
@ -179,9 +176,6 @@ namespace System.Net.Sockets
}
#if !NET_2_1 || MOBILE
#if TARGET_JVM
[MonoNotSupported ("Not supported since Socket.SendTimeout is not supported")]
#endif
public override int WriteTimeout
{
get {
@ -431,12 +425,6 @@ namespace System.Net.Sockets
throw new ObjectDisposedException (GetType().FullName);
}
#if TARGET_JVM
public void ChangeToSSLSocket()
{
socket.ChangeToSSL();
}
#endif
}
}