You've already forked linux-packaging-mono
Imported Upstream version 5.0.0.78
Former-commit-id: 1a2c1dd1445940afa663f5da05294270f9574676
This commit is contained in:
parent
270395db27
commit
5c980d35e6
@ -901,12 +901,11 @@ namespace System.Net.Sockets
|
||||
SocketAsyncResult ares;
|
||||
|
||||
if (!GetCheckedIPs (e, out addresses)) {
|
||||
e.socket_async_result.EndPoint = e.RemoteEndPoint;
|
||||
//NOTE: DualMode may cause Socket's RemoteEndpoint to differ in AddressFamily from the
|
||||
// SocketAsyncEventArgs, but the SocketAsyncEventArgs itself is not changed
|
||||
ares = (SocketAsyncResult) BeginConnect (e.RemoteEndPoint, ConnectAsyncCallback, e);
|
||||
} else {
|
||||
DnsEndPoint dep = (e.RemoteEndPoint as DnsEndPoint);
|
||||
e.socket_async_result.Addresses = addresses;
|
||||
e.socket_async_result.Port = dep.Port;
|
||||
DnsEndPoint dep = (DnsEndPoint)e.RemoteEndPoint;
|
||||
ares = (SocketAsyncResult) BeginConnect (addresses, dep.Port, ConnectAsyncCallback, e);
|
||||
}
|
||||
|
||||
@ -984,8 +983,8 @@ namespace System.Net.Sockets
|
||||
sockares.Complete (new SocketException ((int) SocketError.AddressNotAvailable), true);
|
||||
return sockares;
|
||||
}
|
||||
|
||||
end_point = RemapIPEndPoint (ep);
|
||||
|
||||
sockares.EndPoint = end_point = RemapIPEndPoint (ep);
|
||||
}
|
||||
|
||||
int error = 0;
|
||||
|
@ -1 +1 @@
|
||||
5473cf3916b998b25e4b8dcf2f55fb2b14a3f1e0
|
||||
8cd738dc676c2d39164f5615b57fef3320819aed
|
@ -62,6 +62,7 @@ namespace System.Reflection.Emit {
|
||||
private FieldBuilder[] global_fields;
|
||||
bool is_main;
|
||||
private MonoResource[] resources;
|
||||
private IntPtr unparented_classes;
|
||||
#endregion
|
||||
#pragma warning restore 169, 414
|
||||
|
||||
|
@ -79,6 +79,7 @@ namespace System.Reflection.Emit
|
||||
private GenericTypeParameterBuilder[] generic_params;
|
||||
private RefEmitPermissionSet[] permissions;
|
||||
private TypeInfo created;
|
||||
private int state;
|
||||
#endregion
|
||||
#pragma warning restore 169
|
||||
|
||||
|
@ -1 +1 @@
|
||||
19be52d9a91b4b96f644a19d9b239df623d3ac66
|
||||
c145c6770452545322a5dd359447663fa340d536
|
@ -1 +1 @@
|
||||
9730a8aa4510c1e02ddaf93e1b0858f961a19d27
|
||||
066bc9062048be6b18ca61602d127caa45a9e448
|
@ -1 +1 @@
|
||||
7371a053c5c8987cffb8e4d67eee423567c42a84
|
||||
7994e5dac7692b46aba8982a568232486c9ab689
|
Reference in New Issue
Block a user