From 8e9e29f8875156e4257c276765ac0b68bc19915d Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Fri, 21 Nov 2014 10:02:24 +1100
Subject: [PATCH] 452188 Delay dispatch until content optimisation

Make delay the default
---
 jetty-server/src/main/config/etc/jetty.xml                      | 2 +-
 jetty-server/src/main/config/modules/server.mod                 | 2 +-
 .../main/java/org/eclipse/jetty/server/HttpConfiguration.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml
index 5be3bb0334a..cafd2924ecd 100644
--- a/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-server/src/main/config/etc/jetty.xml
@@ -85,7 +85,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="delayDispatchOnContent"><Property name="jetty.delayDispatchOnContent" default="false"/></Set>
+      <Set name="delayDispatchOnContent"><Property name="jetty.delayDispatchOnContent" 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 910747f7c78..7404377755f 100644
--- a/jetty-server/src/main/config/modules/server.mod
+++ b/jetty-server/src/main/config/modules/server.mod
@@ -46,4 +46,4 @@ jetty.dump.start=false
 # Dump the state of the Jetty server, before stop
 jetty.dump.stop=false
 # Enable delayed dispatch optimisation
-jetty.delayDispatchOnContent=false
+jetty.delayDispatchOnContent=true
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 fb6d13be311..153496b606c 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
@@ -53,7 +53,7 @@ public class HttpConfiguration
     private boolean _sendServerVersion = true; //send Server: header
     private boolean _sendXPoweredBy = false; //send X-Powered-By: header
     private boolean _sendDateHeader = true; //send Date: header
-    private boolean _delayDispatchOnContent = false; // Don't dispatch until content arrives
+    private boolean _delayDispatchOnContent = true; // Don't dispatch until content arrives
 
     
     /* ------------------------------------------------------------ */