Merge branch 'dev' of github.com:Neilpang/acme.sh into dev

This commit is contained in:
neilpang 2019-07-18 21:07:34 +08:00
commit 5e970cdca4
2 changed files with 2 additions and 2 deletions

View File

@ -3621,7 +3621,7 @@ _ns_purge_cf() {
_cf_d="$1" _cf_d="$1"
_cf_d_type="$2" _cf_d_type="$2"
_debug "Cloudflare purge $_cf_d_type record for domain $_cf_d" _debug "Cloudflare purge $_cf_d_type record for domain $_cf_d"
_cf_purl="https://1.1.1.1/api/v1/purge?domain=$_cf_d&type=$_cf_d_type" _cf_purl="https://1.0.0.1/api/v1/purge?domain=$_cf_d&type=$_cf_d_type"
response="$(_post "" "$_cf_purl")" response="$(_post "" "$_cf_purl")"
_debug2 response "$response" _debug2 response "$response"
} }

View File

@ -164,7 +164,7 @@ _namecheap_set_publicip() {
_debug sourceip "$NAMECHEAP_SOURCEIP" _debug sourceip "$NAMECHEAP_SOURCEIP"
ip=$(echo "$NAMECHEAP_SOURCEIP" | _egrep_o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}') ip=$(echo "$NAMECHEAP_SOURCEIP" | _egrep_o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')
addr=$(echo "$NAMECHEAP_SOURCEIP" | _egrep_o '(http|https)://.*') addr=$(echo "$NAMECHEAP_SOURCEIP" | _egrep_o '(http|https):\/\/.*')
_debug2 ip "$ip" _debug2 ip "$ip"
_debug2 addr "$addr" _debug2 addr "$addr"