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
de14d59b
Unverified
Commit
de14d59b
authored
Feb 04, 2024
by
neil
Committed by
GitHub
Feb 04, 2024
Browse files
Merge pull request #4987 from acmesh-official/dev
sync
parents
160b2e95
d76272f0
Changes
2
Show whitespace changes
Inline
Side-by-side
.github/workflows/pr_dns.yml
View file @
de14d59b
...
...
@@ -4,8 +4,6 @@ on:
pull_request_target
:
types
:
-
opened
branches
:
-
'
dev'
paths
:
-
'
dnsapi/*.sh'
...
...
@@ -22,6 +20,7 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
body: `**Welcome**
First thing: don't send PR to the master branch, please send to the dev branch instead.
Please make sure you've read our [DNS API Dev Guide](../wiki/DNS-API-Dev-Guide) and [DNS-API-Test](../wiki/DNS-API-Test).
Then reply on this message, otherwise, your code will not be reviewed or merged.
We look forward to reviewing your Pull request shortly ✨
...
...
acme.sh
View file @
de14d59b
...
...
@@ -2519,22 +2519,34 @@ _startserver() {
_content_len
=
"
$(
printf
"%s"
"
$content
"
|
wc
-c
)
"
_debug _content_len
"
$_content_len
"
_debug
"_NC"
"
$_NC
$SOCAT_OPTIONS
"
export
_SOCAT_ERR
=
"
$(
_mktemp
)
"
$_NC
$SOCAT_OPTIONS
SYSTEM:
"sleep 1;
\
echo 'HTTP/1.0 200 OK';
\
echo 'Content-Length
\:
$_content_len
';
\
echo '';
\
printf '%s' '
$content
';"
&
printf '%s' '
$content
';"
2>
"
$_SOCAT_ERR
"
&
serverproc
=
"
$!
"
if
[
-f
"
$_SOCAT_ERR
"
]
;
then
if
grep
"Permission denied"
"
$_SOCAT_ERR
"
>
/dev/null
;
then
_err
"socat:
$(
cat
$_SOCAT_ERR
)
"
_err
"Can not listen for user:
$(
whoami
)
"
_err
"Maybe try with root again?"
rm
-f
"
$_SOCAT_ERR
"
return
1
fi
fi
}
_stopserver
()
{
pid
=
"
$1
"
_debug
"pid"
"
$pid
"
if
[
-z
"
$pid
"
]
;
then
rm
-f
"
$_SOCAT_ERR
"
return
fi
kill
$pid
rm
-f
"
$_SOCAT_ERR
"
}
...
...
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