Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
c2ad1b4e
Unverified
Commit
c2ad1b4e
authored
Jan 28, 2023
by
neil
Committed by
GitHub
Jan 28, 2023
Browse files
Merge pull request #4448 from PMExtra/feature/curl_fail
curl return fail if HTTP errors
parents
ba9d146d
a5b04a03
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
c2ad1b4e
...
@@ -1852,9 +1852,14 @@ _inithttp() {
...
@@ -1852,9 +1852,14 @@ _inithttp() {
_ACME_CURL
=
"
$_ACME_CURL
--cacert
$CA_BUNDLE
"
_ACME_CURL
=
"
$_ACME_CURL
--cacert
$CA_BUNDLE
"
fi
fi
if
_contains
"
$(
curl
--help
2>&1
)
"
"--globoff"
;
then
if
_contains
"
$(
curl
--help
2>&1
)
"
"--globoff"
||
_contains
"
$(
curl
--help
curl 2>&1
)
"
"--globoff"
;
then
_ACME_CURL
=
"
$_ACME_CURL
-g "
_ACME_CURL
=
"
$_ACME_CURL
-g "
fi
fi
#from curl 7.76: return fail on HTTP errors but keep the body
if
_contains
"
$(
curl
--help
http 2>&1
)
"
"--fail-with-body"
;
then
_ACME_CURL
=
"
$_ACME_CURL
--fail-with-body "
fi
fi
fi
if
[
-z
"
$_ACME_WGET
"
]
&&
_exists
"wget"
;
then
if
[
-z
"
$_ACME_WGET
"
]
&&
_exists
"wget"
;
then
...
@@ -1872,11 +1877,11 @@ _inithttp() {
...
@@ -1872,11 +1877,11 @@ _inithttp() {
elif
[
"
$CA_BUNDLE
"
]
;
then
elif
[
"
$CA_BUNDLE
"
]
;
then
_ACME_WGET
=
"
$_ACME_WGET
--ca-certificate=
$CA_BUNDLE
"
_ACME_WGET
=
"
$_ACME_WGET
--ca-certificate=
$CA_BUNDLE
"
fi
fi
fi
#from wget 1.14: do not skip body on 404 error
#from wget 1.14: do not skip body on 404 error
if
[
"
$_ACME_WGET
"
]
&&
_contains
"
$(
$_ACME_WGET
--help
2>&1
)
"
"--content-on-error"
;
then
if
_contains
"
$(
wget
--help
2>&1
)
"
"--content-on-error"
;
then
_ACME_WGET
=
"
$_ACME_WGET
--content-on-error "
_ACME_WGET
=
"
$_ACME_WGET
--content-on-error "
fi
fi
fi
__HTTP_INITIALIZED
=
1
__HTTP_INITIALIZED
=
1
...
...
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