merge bug26283 into stable

michaelklishin · michaelklishin · commit afe475e114a3 · 2014-07-04T15:24:46.000+04:00
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs b/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs
@@ -80,6 +80,12 @@ public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint,
                 {
                     m_socket = null;
                 }
+                // Mono might raise a SocketException when using IPv4 addresses on
+                // an OS that supports IPv6
+                catch (SocketException)
+                {
+                    m_socket = null;
+                }
             }
             if (m_socket == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint,`
`80`	`80`	`{`
`81`	`81`	`m_socket = null;`
`82`	`82`	`}`
	`83`	`+ // Mono might raise a SocketException when using IPv4 addresses on`
	`84`	`+ // an OS that supports IPv6`
	`85`	`+ catch (SocketException)`
	`86`	`+ {`
	`87`	`+ m_socket = null;`
	`88`	`+ }`
`83`	`89`	`}`
`84`	`90`	`if (m_socket == null)`
`85`	`91`	`{`