From fb477ee1bd63576e258a311466592679853a5560 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 22 Jun 2011 05:57:38 +0000 Subject: [PATCH] 348652 jetty.sh starts two unix processes git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3413 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 3 ++- jetty-distribution/src/main/resources/bin/jetty.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 10eeec006e7..cdd4feb3919 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -5,13 +5,14 @@ jetty-7.4.3-SNAPSHOT + 347717 start.jar destroys dependent child of --exec + 347889 OSGi should follow directive visibility:=reexport for META-INF/web-fragments and resources + 347898 Close channel on JVM exceptions + + 348652 jetty.sh starts two unix processes + + 348935 Close A tag in directory listing + 349344 Passing empty query string to UrlEncoded#decodeTo(String, MultiMap, String) does not yield an empty map + 349738 set buffer sizes for http client in proxy servlet + 349870 proxy servlet protect continuation against fast failing exchanges + 349896 SCEP supports zero maxIdleTime + 349897 draft -09 websockets + 349997 MBeanContainer uses weak references - + 348935 Close A tag in directory listing + JETTY-1342 Recreate selector in change task jetty-7.4.2.v20110526 diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh index a916ad12af8..7f6b5494639 100755 --- a/jetty-distribution/src/main/resources/bin/jetty.sh +++ b/jetty-distribution/src/main/resources/bin/jetty.sh @@ -444,7 +444,7 @@ case "$ACTION" in chown "$JETTY_USER" "$JETTY_PID" # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc. su - "$JETTY_USER" -c " - ${RUN_CMD[*]} --daemon & + exec ${RUN_CMD[*]} --daemon & disown \$! echo \$! > '$JETTY_PID'" else