mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-24 14:11:42 +00:00
fix error message for nc
This commit is contained in:
parent
54ae008dd7
commit
3e5b102445
37
acme.sh
37
acme.sh
@ -1423,32 +1423,29 @@ _startserver() {
|
||||
#for centos ncat
|
||||
if _contains "$nchelp" "nmap.org"; then
|
||||
_debug "Using ncat: nmap.org"
|
||||
if [ "$DEBUG" ]; then
|
||||
if printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC "$Le_HTTPPort"; then
|
||||
if ! _exec "printf \"%s\r\n\r\n%s\" \"HTTP/1.1 200 OK\" \"$content\" | $_NC \"$Le_HTTPPort\" >&2"; then
|
||||
_exec_err
|
||||
return 1
|
||||
fi
|
||||
if [ "$DEBUG" ] ; then
|
||||
_exec_err
|
||||
fi
|
||||
return
|
||||
fi
|
||||
else
|
||||
if printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC "$Le_HTTPPort" >/dev/null 2>&1; then
|
||||
return
|
||||
fi
|
||||
fi
|
||||
_err "ncat listen error."
|
||||
fi
|
||||
|
||||
# while true ; do
|
||||
if [ "$DEBUG" ]; then
|
||||
if ! printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC -p "$Le_HTTPPort"; then
|
||||
printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC "$Le_HTTPPort"
|
||||
fi
|
||||
else
|
||||
if ! printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC -p "$Le_HTTPPort" >/dev/null 2>&1; then
|
||||
printf "%s\r\n\r\n%s" "HTTP/1.1 200 OK" "$content" | $_NC "$Le_HTTPPort" >/dev/null 2>&1
|
||||
fi
|
||||
if ! _exec "printf \"%s\r\n\r\n%s\" \"HTTP/1.1 200 OK\" \"$content\" | $_NC -p \"$Le_HTTPPort\" >&2"; then
|
||||
_exec "printf \"%s\r\n\r\n%s\" \"HTTP/1.1 200 OK\" \"$content\" | $_NC \"$Le_HTTPPort\" >&2"
|
||||
fi
|
||||
|
||||
if [ "$?" != "0" ]; then
|
||||
_err "nc listen error."
|
||||
_exec_err
|
||||
exit 1
|
||||
fi
|
||||
if [ "$DEBUG" ] ; then
|
||||
_exec_err
|
||||
fi
|
||||
# done
|
||||
}
|
||||
|
||||
@ -1781,14 +1778,14 @@ _exec() {
|
||||
fi
|
||||
|
||||
if [ "$_EXEC_TEMP_ERR" ]; then
|
||||
"$@" 2>"$_EXEC_TEMP_ERR"
|
||||
eval "$@ 2>>$_EXEC_TEMP_ERR"
|
||||
else
|
||||
"$@"
|
||||
eval "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
_exec_err() {
|
||||
[ "$_EXEC_TEMP_ERR" ] && _err "$(cat "$_EXEC_TEMP_ERR")"
|
||||
[ "$_EXEC_TEMP_ERR" ] && _err "$(cat "$_EXEC_TEMP_ERR")" && echo "" >"$_EXEC_TEMP_ERR"
|
||||
}
|
||||
|
||||
_apachePath() {
|
||||
|
Loading…
Reference in New Issue
Block a user