From owner-svn-src-user@FreeBSD.ORG Fri Oct 17 00:05:33 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7DF0EF22;
Fri, 17 Oct 2014 00:05:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 5FA05382;
Fri, 17 Oct 2014 00:05:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9H05X8c067356;
Fri, 17 Oct 2014 00:05:33 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9H05Wc4067348;
Fri, 17 Oct 2014 00:05:32 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201410170005.s9H05Wc4067348@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 17 Oct 2014 00:05:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r273200 - in user/cperciva/freebsd-update-build/patches:
10.0-RELEASE 8.4-RELEASE 9.1-RELEASE 9.2-RELEASE 9.3-RELEASE
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2014 00:05:33 -0000
Author: delphij
Date: Fri Oct 17 00:05:31 2014
New Revision: 273200
URL: https://svnweb.freebsd.org/changeset/base/273200
Log:
Commit patches from 2014-09-16 batch.
Added:
user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp
user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp
user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp
user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp
Added: user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.0-RELEASE/9-SA-14:19.tcp Fri Oct 17 00:05:31 2014 (r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c (revision 271383)
++++ sys/netinet/tcp_input.c (working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+
+ todrop = tp->rcv_nxt - th->th_seq;
+ if (todrop > 0) {
+- /*
+- * If this is a duplicate SYN for our current connection,
+- * advance over it and pretend and it's not a SYN.
+- */
+- if (thflags & TH_SYN && th->th_seq == tp->irs) {
++ if (thflags & TH_SYN) {
+ thflags &= ~TH_SYN;
+ th->th_seq++;
+ if (th->th_urp > 1)
Added: user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/8.4-RELEASE/16-SA-14:19.tcp Fri Oct 17 00:05:31 2014 (r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c (revision 271383)
++++ sys/netinet/tcp_input.c (working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+
+ todrop = tp->rcv_nxt - th->th_seq;
+ if (todrop > 0) {
+- /*
+- * If this is a duplicate SYN for our current connection,
+- * advance over it and pretend and it's not a SYN.
+- */
+- if (thflags & TH_SYN && th->th_seq == tp->irs) {
++ if (thflags & TH_SYN) {
+ thflags &= ~TH_SYN;
+ th->th_seq++;
+ if (th->th_urp > 1)
Added: user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.1-RELEASE/19-SA-14:19.tcp Fri Oct 17 00:05:31 2014 (r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c (revision 271383)
++++ sys/netinet/tcp_input.c (working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+
+ todrop = tp->rcv_nxt - th->th_seq;
+ if (todrop > 0) {
+- /*
+- * If this is a duplicate SYN for our current connection,
+- * advance over it and pretend and it's not a SYN.
+- */
+- if (thflags & TH_SYN && th->th_seq == tp->irs) {
++ if (thflags & TH_SYN) {
+ thflags &= ~TH_SYN;
+ th->th_seq++;
+ if (th->th_urp > 1)
Added: user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.2-RELEASE/12-SA-14:19.tcp Fri Oct 17 00:05:31 2014 (r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c (revision 271383)
++++ sys/netinet/tcp_input.c (working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+
+ todrop = tp->rcv_nxt - th->th_seq;
+ if (todrop > 0) {
+- /*
+- * If this is a duplicate SYN for our current connection,
+- * advance over it and pretend and it's not a SYN.
+- */
+- if (thflags & TH_SYN && th->th_seq == tp->irs) {
++ if (thflags & TH_SYN) {
+ thflags &= ~TH_SYN;
+ th->th_seq++;
+ if (th->th_urp > 1)
Added: user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/9.3-RELEASE/2-SA-14:19.tcp Fri Oct 17 00:05:31 2014 (r273200)
@@ -0,0 +1,17 @@
+Index: sys/netinet/tcp_input.c
+===================================================================
+--- sys/netinet/tcp_input.c (revision 271383)
++++ sys/netinet/tcp_input.c (working copy)
+@@ -2092,11 +2092,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th,
+
+ todrop = tp->rcv_nxt - th->th_seq;
+ if (todrop > 0) {
+- /*
+- * If this is a duplicate SYN for our current connection,
+- * advance over it and pretend and it's not a SYN.
+- */
+- if (thflags & TH_SYN && th->th_seq == tp->irs) {
++ if (thflags & TH_SYN) {
+ thflags &= ~TH_SYN;
+ th->th_seq++;
+ if (th->th_urp > 1)