diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-09-21 18:45:41 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-09-21 18:45:41 +0000 |
| commit | 06aedcdaf863f32b0c29ce5b0949088a241c717f (patch) | |
| tree | 71cfda2033e2937556676fd428962288158a6f63 /usr.sbin/relayd/parse.y | |
| parent | a09112f8e6716960b51e6eb146008cc7f28c9a43 (diff) | |
During socket splicing the relayd session timeouts could not be
measured exactly in user land. Use the new idle timeout for socket
splicing in the kernel to make it correct. Also do splicing with
http if relayd does not check headers.
ok mikeb
Diffstat (limited to 'usr.sbin/relayd/parse.y')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index e2f2c8aaaac..a98b6eceec5 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.158 2011/05/26 14:48:20 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.159 2011/09/21 18:45:40 bluhm Exp $ */ /* * Copyright (c) 2007-2011 Reyk Floeter <reyk@openbsd.org> @@ -833,13 +833,6 @@ proto : relay_proto PROTO STRING { p->type = $1; p->cache = RELAY_CACHESIZE; p->tcpflags = TCPFLAG_DEFAULT; - if (p->type != RELAY_PROTO_TCP) { - /* - * Splicing is currently only supported - * for plain TCP relays. - */ - p->tcpflags |= TCPFLAG_NSPLICE; - } p->sslflags = SSLFLAG_DEFAULT; p->tcpbacklog = RELAY_BACKLOG; (void)strlcpy(p->sslciphers, SSLCIPHERS_DEFAULT, |