Merge branch '2.9dev' of github.com:drwetter/testssl.sh into 2.9dev

This commit is contained in:
Dirk 2017-05-08 23:55:19 +02:00
commit 23e6209beb
1 changed files with 1 additions and 2 deletions

View File

@ -6858,7 +6858,7 @@ starttls_full_read(){
local oldIFS="$IFS" local oldIFS="$IFS"
IFS='' IFS=''
while read -r -t $STARTTLS_SLEEP one_line; do while read -r -t $STARTTLS_SLEEP one_line; ret=$?; (exit $ret); do
debugme echo "S: ${one_line}" debugme echo "S: ${one_line}"
if [[ $# -ge 3 ]]; then if [[ $# -ge 3 ]]; then
if [[ ${one_line} =~ $3 ]]; then if [[ ${one_line} =~ $3 ]]; then
@ -6878,7 +6878,6 @@ starttls_full_read(){
return 2 return 2
fi fi
done <&5 done <&5
ret=$?
debugme echo "=== full read error/timeout ===" debugme echo "=== full read error/timeout ==="
IFS="${oldIFS}" IFS="${oldIFS}"
return $ret return $ret