summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-03-29 14:06:04 +0000
committerglebius <glebius@FreeBSD.org>2013-03-29 14:06:04 +0000
commit06ecb1b7cada59fcf9ba274b517b978ac404fa1e (patch)
treec62d66783184c8ddedb0f543e4350e49811f8605
parentffd07149de77f40048fd2d96196afdc7c7c13799 (diff)
downloadFreeBSD-src-06ecb1b7cada59fcf9ba274b517b978ac404fa1e.zip
FreeBSD-src-06ecb1b7cada59fcf9ba274b517b978ac404fa1e.tar.gz
Once ng_ksocket(4) is fixed, re-apply r194662. See this revision for
longer description. Discussed with: andre, rwatson Sponsored by: Nginx, Inc.
-rw-r--r--sys/kern/uipc_sockbuf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 93c96bf..29575c4 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -528,6 +528,9 @@ sbappendstream_locked(struct sockbuf *sb, struct mbuf *m)
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;
OpenPOWER on IntegriCloud