Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
3e5b1024
Commit
3e5b1024
authored
Nov 16, 2016
by
neilpang
Browse files
fix error message for nc
parent
54ae008d
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
3e5b1024
...
...
@@ -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
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
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
_err
"ncat listen error."
return
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() {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment