From owner-freebsd-gecko@FreeBSD.ORG  Tue Aug 14 21:44:38 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 176B8106566C
	for <freebsd-gecko@freebsd.org>; Tue, 14 Aug 2012 21:44:38 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 923368FC08
	for <freebsd-gecko@freebsd.org>; Tue, 14 Aug 2012 21:44:37 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q7ELiaMu086880
	for <freebsd-gecko@freebsd.org>; Tue, 14 Aug 2012 21:44:36 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7ELiVXe086507
	for freebsd-gecko@freebsd.org; Tue, 14 Aug 2012 21:44:31 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 14 Aug 2012 21:44:31 GMT
Message-Id: <201208142144.q7ELiVXe086507@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r931 - branches/experimental/devel/nspr/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Aug 2012 21:44:38 -0000

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.