Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
dbab5190
Unverified
Commit
dbab5190
authored
Oct 04, 2022
by
neil
Committed by
GitHub
Oct 04, 2022
Browse files
Merge pull request #4252 from agowa338/agowa338-patch-1
Fix missing HTTP_HEADER for _get with wget
parents
e888c965
41dbf1dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
dbab5190
...
@@ -1999,7 +1999,13 @@ _post() {
...
@@ -1999,7 +1999,13 @@ _post() {
if
[
"
$_ret
"
!=
"0"
]
;
then
if
[
"
$_ret
"
!=
"0"
]
;
then
_err
"Please refer to https://www.gnu.org/software/wget/manual/html_node/Exit-Status.html for error code:
$_ret
"
_err
"Please refer to https://www.gnu.org/software/wget/manual/html_node/Exit-Status.html for error code:
$_ret
"
fi
fi
_sed_i
"s/^ *//g"
"
$HTTP_HEADER
"
if
_contains
"
$_WGET
"
" -d "
;
then
# Demultiplex wget debug output
cat
"
$HTTP_HEADER
"
>
&2
_sed_i
'/^[^ ][^ ]/d; /^ *$/d'
"
$HTTP_HEADER
"
fi
# remove leading whitespaces from header to match curl format
_sed_i
's/^ //g'
"
$HTTP_HEADER
"
else
else
_ret
=
"
$?
"
_ret
=
"
$?
"
_err
"Neither curl nor wget is found, can not do
$httpmethod
."
_err
"Neither curl nor wget is found, can not do
$httpmethod
."
...
@@ -2052,9 +2058,21 @@ _get() {
...
@@ -2052,9 +2058,21 @@ _get() {
fi
fi
_debug
"_WGET"
"
$_WGET
"
_debug
"_WGET"
"
$_WGET
"
if
[
"
$onlyheader
"
]
;
then
if
[
"
$onlyheader
"
]
;
then
$_WGET
--user-agent
=
"
$USER_AGENT
"
--header
"
$_H5
"
--header
"
$_H4
"
--header
"
$_H3
"
--header
"
$_H2
"
--header
"
$_H1
"
-S
-O
/dev/null
"
$url
"
2>&1 |
sed
's/^[ ]*//g'
_wget_out
=
"
$(
$_WGET
--user-agent
=
"
$USER_AGENT
"
--header
"
$_H5
"
--header
"
$_H4
"
--header
"
$_H3
"
--header
"
$_H2
"
--header
"
$_H1
"
-S
-O
/dev/null
"
$url
"
2>&1
)
"
if
_contains
"
$_WGET
"
" -d "
;
then
# Demultiplex wget debug output
echo
"
$_wget_out
"
>
&2
echo
"
$_wget_out
"
|
sed
'/^[^ ][^ ]/d; /^ *$/d; s/^ //g'
-
fi
else
else
$_WGET
--user-agent
=
"
$USER_AGENT
"
--header
"
$_H5
"
--header
"
$_H4
"
--header
"
$_H3
"
--header
"
$_H2
"
--header
"
$_H1
"
-O
-
"
$url
"
$_WGET
--user-agent
=
"
$USER_AGENT
"
--header
"
$_H5
"
--header
"
$_H4
"
--header
"
$_H3
"
--header
"
$_H2
"
--header
"
$_H1
"
-S
-O
-
"
$url
"
2>
"
$HTTP_HEADER
"
if
_contains
"
$_WGET
"
" -d "
;
then
# Demultiplex wget debug output
cat
"
$HTTP_HEADER
"
>
&2
_sed_i
'/^[^ ][^ ]/d; /^ *$/d'
"
$HTTP_HEADER
"
fi
# remove leading whitespaces from header to match curl format
_sed_i
's/^ //g'
"
$HTTP_HEADER
"
fi
fi
ret
=
$?
ret
=
$?
if
[
"
$ret
"
=
"8"
]
;
then
if
[
"
$ret
"
=
"8"
]
;
then
...
...
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