Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-03-25 21:42:09 -0400
committerGreg Wilkins2015-03-25 21:42:09 -0400
commite09304104028e9643de6e92e4e5aa69481de623e (patch)
tree1f42c484dafeda47def09c563aeb72017ae694c7
parent1cb0449be3a7030c923be3a76299cd29ebbf5842 (diff)
downloadorg.eclipse.jetty.project-e09304104028e9643de6e92e4e5aa69481de623e.tar.gz
org.eclipse.jetty.project-e09304104028e9643de6e92e4e5aa69481de623e.tar.xz
org.eclipse.jetty.project-e09304104028e9643de6e92e4e5aa69481de623e.zip
enabled delayed dispatch by default
-rw-r--r--jetty-server/src/main/config/etc/jetty.xml2
-rw-r--r--jetty-server/src/main/config/modules/server.mod15
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java2
3 files changed, 15 insertions, 4 deletions
diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index e2e45b6953..91109f9f36 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -86,7 +86,7 @@
<Set name="sendServerVersion"><Property name="jetty.send.server.version" default="true" /></Set>
<Set name="sendDateHeader"><Property name="jetty.send.date.header" default="false" /></Set>
<Set name="headerCacheSize">512</Set>
- <Set name="delayDispatchUntilContent"><Property name="jetty.delayDispatchUntilContent" default="false"/></Set>
+ <Set name="delayDispatchUntilContent"><Property name="jetty.delayDispatchUntilContent" default="true"/></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 b3f87de162..f729dc4394 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -25,25 +25,36 @@ etc/jetty.xml
##
# minimum number of threads
threads.min=10
+
# maximum number of threads
threads.max=200
+
# thread idle timeout in milliseconds
threads.timeout=60000
+
# buffer size for output
jetty.output.buffer.size=32768
+
# request header buffer size
jetty.request.header.size=8192
+
# response header buffer size
jetty.response.header.size=8192
+
# should jetty send the server version header?
jetty.send.server.version=true
+
# should jetty send the date header?
jetty.send.date.header=false
+
# What host to listen on (leave commented to listen on all interfaces)
#jetty.host=myhost.com
+
+# Enable delayed dispatch optimisation
+jetty.delayDispatchUntilContent=true
+
# Dump the state of the Jetty server, components, and webapps after startup
jetty.dump.start=false
+
# Dump the state of the Jetty server, before stop
jetty.dump.stop=false
-# Enable delayed dispatch optimisation
-jetty.delayDispatchUntilContent=false
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
index 75c755d057..e13d4b82a8 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
@@ -222,7 +222,7 @@ public class HttpConfiguration
/* ------------------------------------------------------------ */
/**
- * @param delay if true, delay the application dispatch until content is available
+ * @param delay if true, delay the application dispatch until content is available (default false)
*/
public void setDelayDispatchUntilContent(boolean delay)
{

Back to the top