Merge pull request #1749 from Neilpang/dev

Dev
This commit is contained in:
neil 2018-07-26 21:56:39 +08:00 committed by GitHub
commit 91391fba5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

15
acme.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
VER=2.7.9 VER=2.8.0
PROJECT_NAME="acme.sh" PROJECT_NAME="acme.sh"
@ -1374,17 +1374,17 @@ _url_replace() {
} }
_time2str() { _time2str() {
#Linux
if date -u -d@"$1" 2>/dev/null; then
return
fi
#BSD #BSD
if date -u -r "$1" 2>/dev/null; then if date -u -r "$1" 2>/dev/null; then
return return
fi fi
#Soaris #Linux
if date -u -d@"$1" 2>/dev/null; then
return
fi
#Solaris
if _exists adb; then if _exists adb; then
_t_s_a=$(echo "0t${1}=Y" | adb) _t_s_a=$(echo "0t${1}=Y" | adb)
echo "$_t_s_a" echo "$_t_s_a"
@ -1899,6 +1899,7 @@ _send_signed_request() {
if _contains "$_body" "JWS has invalid anti-replay nonce" || _contains "$_body" "JWS has an invalid anti-replay nonce"; then if _contains "$_body" "JWS has invalid anti-replay nonce" || _contains "$_body" "JWS has an invalid anti-replay nonce"; then
_info "It seems the CA server is busy now, let's wait and retry." _info "It seems the CA server is busy now, let's wait and retry."
_CACHED_NONCE=""
_sleep 5 _sleep 5
continue continue
fi fi