Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-10-05 18:14:19 -0400
committerGreg Wilkins2015-10-05 18:14:19 -0400
commit4d4ed7bbe219b84856157c37ea6d370d38db15ff (patch)
tree39a08ecd500d0f62626266374eee284d9acec07a
parent399755b352b37e02f5baf211870de14072d8a0df (diff)
downloadorg.eclipse.jetty.project-4d4ed7bbe219b84856157c37ea6d370d38db15ff.tar.gz
org.eclipse.jetty.project-4d4ed7bbe219b84856157c37ea6d370d38db15ff.tar.xz
org.eclipse.jetty.project-4d4ed7bbe219b84856157c37ea6d370d38db15ff.zip
478923 Add XML property for blockingTimeout
-rw-r--r--jetty-server/src/main/config/etc/jetty.xml1
-rw-r--r--jetty-server/src/main/config/modules/server.mod4
2 files changed, 5 insertions, 0 deletions
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index d7d295cef5..5412979cac 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -88,6 +88,7 @@
<Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set>
<Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent" deprecated="jetty.delayDispatchUntilContent" default="true"/></Set>
<Set name="maxErrorDispatches"><Property name="jetty.httpConfig.maxErrorDispatches" default="10"/></Set>
+ <Set name="blockingTimeout"><Property name="jetty.httpConfig.blockingTimeout" default="-1"/></Set>
<!-- Uncomment to enable handling of X-Forwarded- style headers
<Call name="addCustomizer">
<Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod
index 6857cca5e4..14d6b58e88 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -64,6 +64,9 @@ etc/jetty.xml
## Maximum number of error dispatches to prevent looping
# jetty.httpConfig.maxErrorDispatches=10
+## Maximum time to block in total for a blocking IO operation (default -1 is to use idleTimeout on progress)
+# jetty.httpConfig.blockingTimeout=-1
+
### Server configuration
## Whether ctrl+c on the console gracefully stops the Jetty server
# jetty.server.stopAtShutdown=true
@@ -73,3 +76,4 @@ etc/jetty.xml
## Dump the state of the Jetty server, components, and webapps before shutdown
# jetty.server.dumpBeforeStop=false
+

Back to the top