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

2017-10-20 11:27:55 +11:00 · 2017-10-20 11:27:55 +11:00 · 530e28563c
parent 348cbb02c0 be04d47a9d
commit 530e28563c
1 changed files with 3 additions and 2 deletions
--- a/jetty-home/src/main/resources/bin/jetty.sh
+++ b/jetty-home/src/main/resources/bin/jetty.sh
@ -484,9 +484,10 @@ case "$ACTION" in
        chown "$JETTY_USER" "$JETTY_PID"
        # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
        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 \$!
-          echo \$! > '$JETTY_PID'"
+          echo \$! > \"$JETTY_PID\""
      else
        "${RUN_CMD[@]}" > /dev/null &
        disown $!