From cc2d59468d69ed40527113d99f0aee275a72885d Mon Sep 17 00:00:00 2001
From: neilpang <neil@neilpang.com>
Date: Thu, 26 Jul 2018 21:57:22 +0800
Subject: [PATCH 1/2] use json content type for both v1 and v2

---
 acme.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/acme.sh b/acme.sh
index 69584cca..bd0c390d 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1795,11 +1795,8 @@ _send_signed_request() {
     return 1
   fi
 
-  if [ "$ACME_VERSION" = "2" ]; then
-    __request_conent_type="$CONTENT_TYPE_JSON"
-  else
-    __request_conent_type=""
-  fi
+  __request_conent_type="$CONTENT_TYPE_JSON"
+
   payload64=$(printf "%s" "$payload" | _base64 | _url_replace)
   _debug3 payload64 "$payload64"
 

From 709a3fb06fceaa2f26655b5b1b64aabe51f22446 Mon Sep 17 00:00:00 2001
From: neilpang <neil@neilpang.com>
Date: Sat, 28 Jul 2018 22:02:03 +0800
Subject: [PATCH 2/2] add more retry for badnonce error

---
 acme.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/acme.sh b/acme.sh
index bd0c390d..32219d9d 100755
--- a/acme.sh
+++ b/acme.sh
@@ -1800,7 +1800,8 @@ _send_signed_request() {
   payload64=$(printf "%s" "$payload" | _base64 | _url_replace)
   _debug3 payload64 "$payload64"
 
-  MAX_REQUEST_RETRY_TIMES=5
+  MAX_REQUEST_RETRY_TIMES=20
+  _sleep_retry_sec=1
   _request_retry_times=0
   while [ "${_request_retry_times}" -lt "$MAX_REQUEST_RETRY_TIMES" ]; do
     _request_retry_times=$(_math "$_request_retry_times" + 1)
@@ -1895,9 +1896,9 @@ _send_signed_request() {
     fi
 
     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. Sleeping $_sleep_retry_sec seconds."
       _CACHED_NONCE=""
-      _sleep 5
+      _sleep $_sleep_retry_sec
       continue
     fi
     break