diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-09-19 16:06:25 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-09-19 16:06:25 +0000 |
| commit | 9a967ad206c236797ee7794db5c51addcebab16c (patch) | |
| tree | f14a98923b9ecb8eb85c336b410ed48744581d04 /sys/netinet/tcp_input.c | |
| parent | Remove some mvmeppc leftovers. (diff) | |
| download | wireguard-openbsd-9a967ad206c236797ee7794db5c51addcebab16c.tar.xz wireguard-openbsd-9a967ad206c236797ee7794db5c51addcebab16c.zip | |
For incomming connections keep the TF_NOPUSH flag if TCP_NOPUSH was
set on the listen socket.
From David Hill; OK vgross@
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index ddd71064f85..0e7e1789abd 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.327 2016/09/15 02:00:18 dlg Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.328 2016/09/19 16:06:25 bluhm Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -3798,7 +3798,7 @@ syn_cache_get(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th, (void) m_free(am); tp = intotcpcb(inp); - tp->t_flags = sototcpcb(oso)->t_flags & TF_NODELAY; + tp->t_flags = sototcpcb(oso)->t_flags & (TF_NOPUSH|TF_NODELAY); if (sc->sc_request_r_scale != 15) { tp->requested_s_scale = sc->sc_requested_s_scale; tp->request_r_scale = sc->sc_request_r_scale; |