diff options
| -rw-r--r-- | VERSION.txt | 1 | ||||
| -rwxr-xr-x | jetty-distribution/src/main/resources/bin/jetty.sh | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/VERSION.txt b/VERSION.txt index 62569c48f9..b3ce816ee9 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 1229f5d9f5..63172afd8f 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 + |