From owner-svn-src-all@FreeBSD.ORG  Fri Mar 29 14:06:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D23ABD53;
 Fri, 29 Mar 2013 14:06:04 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C521B78E;
 Fri, 29 Mar 2013 14:06:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TE64VA009654;
 Fri, 29 Mar 2013 14:06:04 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TE645J009653;
 Fri, 29 Mar 2013 14:06:04 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201303291406.r2TE645J009653@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 29 Mar 2013 14:06:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248886 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 14:06:04 -0000

Author: glebius
Date: Fri Mar 29 14:06:04 2013
New Revision: 248886
URL: http://svnweb.freebsd.org/changeset/base/248886

Log:
  Once ng_ksocket(4) is fixed, re-apply r194662. See this revision for
  longer description.
  
  Discussed with:	andre, rwatson
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/kern/uipc_sockbuf.c

Modified: head/sys/kern/uipc_sockbuf.c
==============================================================================
--- head/sys/kern/uipc_sockbuf.c	Fri Mar 29 14:04:26 2013	(r248885)
+++ head/sys/kern/uipc_sockbuf.c	Fri Mar 29 14:06:04 2013	(r248886)
@@ -528,6 +528,9 @@ sbappendstream_locked(struct sockbuf *sb
 
 	SBLASTMBUFCHK(sb);
 
+	/* Remove all packet headers and mbuf tags to get a pure data chain. */
+	m_demote(m, 1);
+	
 	sbcompress(sb, m, sb->sb_mbtail);
 
 	sb->sb_lastrecord = sb->sb_mb;