diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-08-23 13:44:59 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-08-23 13:44:59 +0000 |
| commit | 0d8b95a74e7bee7e21af002bc21ecd0b9c16b1d7 (patch) | |
| tree | be532215420ad03bcab3f5f390d1cd151d272281 /sys/kern | |
| parent | 04721191534aa7d5220260a9e69de7c6baa16edf (diff) | |
iPrevent that a socket splicing timeout error in one direction is
also added to the other direction.
ok mikeb@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 1532dcb9107..1e4b869d2e3 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.94 2011/07/04 00:33:36 mikeb Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.95 2011/08/23 13:44:58 bluhm Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1123,7 +1123,7 @@ somove(struct socket *so, int wait) error = EPIPE; goto release; } - if (sosp->so_error) { + if (sosp->so_error && sosp->so_error != ETIMEDOUT) { error = sosp->so_error; goto release; } |