From 32e2ee8cb9b4fcdadca7f3ef01629aa7020c0e3e Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 27 Jul 2016 14:12:46 +1000
Subject: [PATCH] start property for stopTimeout #774

---
 jetty-server/src/main/config/etc/jetty.xml      | 2 +-
 jetty-server/src/main/config/modules/server.mod | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 0ba38381b6f..f85a955c8f0 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -122,7 +122,7 @@
     <!-- extra server options                                        -->
     <!-- =========================================================== -->
     <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set>
-    <Set name="stopTimeout">5000</Set>
+    <Set name="stopTimeout"><Property name="jetty.server.stopTimeout" default="5000"/></Set>
     <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" deprecated="jetty.dump.start" default="false"/></Set>
     <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" deprecated="jetty.dump.stop" default="false"/></Set>
 
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index 14d6b58e88f..a3bbecf890d 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -71,6 +71,9 @@ etc/jetty.xml
 ## Whether ctrl+c on the console gracefully stops the Jetty server
 # jetty.server.stopAtShutdown=true
 
+## Timeout in ms to apply when stopping the server gracefully
+# jetty.server.stopTimeout=5000
+
 ## Dump the state of the Jetty server, components, and webapps after startup
 # jetty.server.dumpAfterStart=false