summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2011-08-25 22:31:07 +0000
committerStephen D. Huston <shuston@apache.org>2011-08-25 22:31:07 +0000
commit251b429eec508db64cf10b859c92e7ffd3119a1e (patch)
treeda73d297000376138c3897471f3e21bf95577486
parenteabacb939662725b4514e898f050805131c2a0fb (diff)
downloadqpid-python-251b429eec508db64cf10b859c92e7ffd3119a1e.tar.gz
Don't try setsockopt IPV6_V6ONLY when setting up new socket. Doesn't work on XP. Addresses note I left in QPID-3406.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1161783 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/sys/windows/Socket.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/Socket.cpp b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
index c85e8162da..1fa4768329 100644
--- a/qpid/cpp/src/qpid/sys/windows/Socket.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Socket.cpp
@@ -136,11 +136,6 @@ void Socket::createSocket(const SocketAddress& sa) const
try {
if (nonblocking) setNonblocking();
if (nodelay) setTcpNoDelay();
- if (getAddrInfo(sa).ai_family == AF_INET6) {
- int flag = 1;
- int result = ::setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&flag, sizeof(flag));
- QPID_WINSOCK_CHECK(result);
- }
} catch (std::exception&) {
::closesocket(s);
socket = INVALID_SOCKET;