diff options
| author |   bluhm <bluhm@openbsd.org> | 2016-09-28 11:46:45 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2016-09-28 11:46:45 +0000 |
| commit | cd3d71a8b6137ae23f7da27b7d885be373e8a638 (patch) | |
| tree | 4523e3fca733cf637d0296ea22c665fcd545cfe3 | |
| parent | An unintened 65536 size change slipped in, revert to 65535 (diff) | |
| download | wireguard-openbsd-cd3d71a8b6137ae23f7da27b7d885be373e8a638.tar.xz wireguard-openbsd-cd3d71a8b6137ae23f7da27b7d885be373e8a638.zip | |
Do not close stdout when starting netcat, redirect to /dev/null
instead. This prevents that the ftp test hangs in nc poll(2). Add
OpenBSD RCS id while there.
| -rw-r--r-- | regress/usr.bin/ftp/dasho.sh | 1 | ||||
| -rw-r--r-- | regress/usr.bin/ftp/redirect.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/regress/usr.bin/ftp/dasho.sh b/regress/usr.bin/ftp/dasho.sh index 13dc37a08f9..49c3f3f75de 100644 --- a/regress/usr.bin/ftp/dasho.sh +++ b/regress/usr.bin/ftp/dasho.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: dasho.sh,v 1.2 2016/09/28 11:46:45 bluhm Exp $ : ${FTP:=ftp} diff --git a/regress/usr.bin/ftp/redirect.sh b/regress/usr.bin/ftp/redirect.sh index 6e365d2e56f..63019d66ae7 100644 --- a/regress/usr.bin/ftp/redirect.sh +++ b/regress/usr.bin/ftp/redirect.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: redirect.sh,v 1.2 2016/09/28 11:46:45 bluhm Exp $ : ${FTP:=ftp} @@ -14,7 +15,7 @@ echo "Testing $req1 => $loc => $req2" # Be sure to kill any previous nc running on our port while pkill -fx "nc -l $rport1" && sleep 1; do done -echo "HTTP/1.0 302 Found\r\nLocation: $loc\r\n\r" | nc -l $rport1 >&- & +echo "HTTP/1.0 302 Found\r\nLocation: $loc\r\n\r" | nc -l $rport1 >/dev/null & # Give the "server" some time to start sleep .1 |