Merge remote-tracking branch 'origin/jetty-9.4.x'

This commit is contained in:
Greg Wilkins 2017-10-20 11:27:55 +11:00
commit 530e28563c
1 changed files with 3 additions and 2 deletions

View File

@ -484,9 +484,10 @@ case "$ACTION" in
chown "$JETTY_USER" "$JETTY_PID" chown "$JETTY_USER" "$JETTY_PID"
# FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc. # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
su - "$JETTY_USER" $SU_SHELL -c " su - "$JETTY_USER" $SU_SHELL -c "
exec ${RUN_CMD[*]} start-log-file="$JETTY_START_LOG" > /dev/null & cd \"$JETTY_BASE\"
exec ${RUN_CMD[*]} start-log-file=\"$JETTY_START_LOG\" > /dev/null &
disown \$! disown \$!
echo \$! > '$JETTY_PID'" echo \$! > \"$JETTY_PID\""
else else
"${RUN_CMD[@]}" > /dev/null & "${RUN_CMD[@]}" > /dev/null &
disown $! disown $!