Skip to content

Commit

Permalink
upstream: Handle zlib compression being disabled now that it's
Browse files Browse the repository at this point in the history
optional.

OpenBSD-Regress-ID: 0af4fbc5168e62f89d0350de524bff1cb00e707a
  • Loading branch information
daztucker committed Jan 23, 2020
1 parent fbce7c1 commit 4151923
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
10 changes: 8 additions & 2 deletions regress/proxy-connect.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# $OpenBSD: proxy-connect.sh,v 1.11 2017/09/26 22:39:25 dtucker Exp $
# $OpenBSD: proxy-connect.sh,v 1.12 2020/01/23 11:19:12 dtucker Exp $
# Placed in the Public Domain.

tid="proxy connect"

for c in no yes; do
if [ "`${SSH} -Q compression`" = "none" ]; then
comp="no"
else
comp="no yes"
fi

for c in $comp; do
verbose "plain username comp=$c"
opts="-oCompression=$c -F $OBJ/ssh_proxy"
SSH_CONNECTION=`${SSH} $opts 999.999.999.999 'echo $SSH_CONNECTION'`
Expand Down
10 changes: 8 additions & 2 deletions regress/putty-transfer.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $OpenBSD: putty-transfer.sh,v 1.6 2018/02/23 03:03:00 djm Exp $
# $OpenBSD: putty-transfer.sh,v 1.7 2020/01/23 11:19:12 dtucker Exp $
# Placed in the Public Domain.

tid="putty transfer data"
Expand All @@ -8,7 +8,13 @@ if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
exit 0
fi

for c in 0 1 ; do
if [ "`${SSH} -Q compression`" = "none" ]; then
comp="0"
else
comp="0 1"
fi

for c in $comp; do
verbose "$tid: compression $c"
rm -f ${COPY}
cp ${OBJ}/.putty/sessions/localhost_proxy \
Expand Down

0 comments on commit 4151923

Please sign in to comment.