summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDavid Yu2009-05-05 03:09:18 (EDT)
committer David Yu2009-05-05 03:09:18 (EDT)
commit806219ab594e9792004ddeec4c43ce275b848e07 (patch)
treea228b1e2571acbd64aec8aa8ac7d2a69cd60d85a
parent0d5ad3fa16404241fb2aee7deae22b07c67698d3 (diff)
downloadorg.eclipse.jetty.project-806219ab594e9792004ddeec4c43ce275b848e07.zip
org.eclipse.jetty.project-806219ab594e9792004ddeec4c43ce275b848e07.tar.gz
org.eclipse.jetty.project-806219ab594e9792004ddeec4c43ce275b848e07.tar.bz2
JETTY-1014 Enable start-stop-daemon by default on jetty.sh (START_STOP_DAEMON=1)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@205 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rwxr-xr-xjetty-distribution/src/main/resources/bin/jetty.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 62569c4..b3ce816 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -7,6 +7,7 @@ jetty-7.0.0.M2-SNAPSHOT
+ 273767 Update to use geronimo annotations spec 1.1.1
+ JETTY-1003 java.lang.IllegalArgumentException: timeout can't be negative
+ JETTY-1004 CERT VU#402580 Canonical path handling includes ? in path segment
+ + JETTY-1014 Enable start-stop-daemon by default on jetty.sh (START_STOP_DAEMON=1)
jetty-6.1.17 30 April 2009
+ JETTY-936 Make optional dispatching to welcome files as servlets
diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh
index 1229f5d..63172af 100755
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@@ -83,6 +83,8 @@
# JETTY_USER
# if set, then used as a username to run the server as
#
+# Set to 0 if you do not want to use start-stop-daemon (especially on SUSE boxes)
+START_STOP_DAEMON=1
usage()
{
@@ -661,3 +663,4 @@ esac
exit 0
+