Date: Tue, 14 Aug 2012 21:44:31 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r931 - branches/experimental/devel/nspr/files Message-ID: <201208142144.q7ELiVXe086507@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Aug 14 21:44:31 2012
New Revision: 931
Log:
disable v6only patch is upstream per bug#266981
Modified:
branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c
Modified: branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c
==============================================================================
--- branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c Tue Aug 14 21:19:55 2012 (r930)
+++ branches/experimental/devel/nspr/files/patch-..::pr::src::pthreads::ptio.c Tue Aug 14 21:44:31 2012 (r931)
@@ -9,24 +9,6 @@
if (getsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
&on, &optlen) == 0) {
_pr_ipv6_v6only_on_by_default = on;
-@@ -3495,6 +3495,17 @@
- &on, sizeof(on));
- }
- #endif
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+ if (domain == PR_AF_INET6) {
-+ int opt = 0;
-+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+ &opt, sizeof(opt))) {
-+ close(osfd);
-+ return NULL;
-+ }
-+ }
-+#endif
- fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
- if (fd == NULL) close(osfd);
- }
@@ -3758,7 +3769,7 @@
* We use these variables to figure out how much time has
* elapsed and how much of the timeout still remains.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208142144.q7ELiVXe086507>