Merge pull request #1048 from Neilpang/dev

Dev
This commit is contained in:
neil 2017-09-27 09:07:26 +08:00 committed by GitHub
commit c47f6ed30a
2 changed files with 3 additions and 3 deletions

View File

@ -1987,7 +1987,7 @@ _startserver() {
_debug "_NC" "$_NC" _debug "_NC" "$_NC"
#todo listen address #todo listen address
$_NC TCP-LISTEN:$Le_HTTPPort,crlf,reuseaddr,fork SYSTEM:"sleep 0.5; echo HTTP/1.1 200 OK'; echo ; echo $content; echo;" & $_NC TCP-LISTEN:$Le_HTTPPort,crlf,reuseaddr,fork SYSTEM:"sleep 0.5; echo HTTP/1.1 200 OK; echo ; echo $content; echo;" &
serverproc="$!" serverproc="$!"
} }

View File

@ -51,8 +51,8 @@ cpanel_uapi_deploy() {
else else
_response=$(uapi SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key") _response=$(uapi SSL install_ssl domain="$_cdomain" cert="$_cert" key="$_key")
fi fi
error_response="status: 0"
if [ $? -ne 0 ]; then if test "${_response#*$error_response}" != "$_response"; then
_err "Error in deploying certificate:" _err "Error in deploying certificate:"
_err "$_response" _err "$_response"
return 1 return 1