Merge remote-tracking branch 'origin/master' into jetty-9.1

Conflicts:
	aggregates/jetty-all/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml

2 files changed, 33 insertions, 26 deletions

diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index c13513f70a..db0ddc5eef 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty.osgi</groupId>
     <artifactId>jetty-osgi-project</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
index d3244b67c0..8c06a2cc25 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-spdy.xml
@@ -54,32 +54,32 @@
     <!-- for all configuration that may be set here.                 -->
     <!-- =========================================================== -->
     <New id="pushStrategy" class="org.eclipse.jetty.spdy.server.http.ReferrerPushStrategy">
-      <!-- Uncomment to blacklist browsers for this push strategy. If one of the blacklisted Strings occurs in the
-           user-agent header sent by the client, push will be disabled for this browser. This is case insensitive" -->
-      <!--
-      <Set name="UserAgentBlacklist">
-          <Array type="String">
-              <Item>.*(?i)firefox/14.*</Item>
-              <Item>.*(?i)firefox/15.*</Item>
-              <Item>.*(?i)firefox/16.*</Item>
-          </Array>
-      </Set>
-      -->
+        <!-- Uncomment to blacklist browsers for this push strategy. If one of the blacklisted Strings occurs in the
+             user-agent header sent by the client, push will be disabled for this browser. This is case insensitive" -->
+        <!--
+        <Set name="UserAgentBlacklist">
+            <Array type="String">
+                <Item>.*(?i)firefox/14.*</Item>
+                <Item>.*(?i)firefox/15.*</Item>
+                <Item>.*(?i)firefox/16.*</Item>
+            </Array>
+        </Set>
+        -->
 
-      <!-- Uncomment to override default file extensions to push -->
-      <!--
-      <Set name="PushRegexps">
-          <Array type="String">
-              <Item>.*\.css</Item>
-              <Item>.*\.js</Item>
-              <Item>.*\.png</Item>
-              <Item>.*\.jpg</Item>
-              <Item>.*\.gif</Item>
-          </Array>
-      </Set>
-      -->
-      <Set name="referrerPushPeriod">5000</Set>
-      <Set name="maxAssociatedResources">32</Set>
+        <!-- Uncomment to override default file extensions to push -->
+        <!--
+        <Set name="PushRegexps">
+            <Array type="String">
+                <Item>.*\.css</Item>
+                <Item>.*\.js</Item>
+                <Item>.*\.png</Item>
+                <Item>.*\.jpg</Item>
+                <Item>.*\.gif</Item>
+            </Array>
+        </Set>
+        -->
+        <Set name="referrerPushPeriod">5000</Set>
+        <Set name="maxAssociatedResources">32</Set>
     </New>
 
     <!-- =========================================================== -->
@@ -121,6 +121,10 @@
                                 <Arg name="config">
                                     <Ref refid="httpConfig"/>
                                 </Arg>
+                                <!-- Set the initial window size for this SPDY connector. -->
+                                <!-- See: http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.8-WINDOW_UPDATE -->
+                                <Set name="initialWindowSize">65536</Set>
+                                <!-- Uncomment to enable the push strategy with id "pushStrategy" -->
                                 <!-- <Arg name="pushStrategy"><Ref refid="pushStrategy"/></Arg> -->
                             </New>
                         </Item>
@@ -131,6 +135,9 @@
                                 <Arg name="config">
                                     <Ref refid="httpConfig"/>
                                 </Arg>
+                                <!-- Set the initial window size for this SPDY connector. -->
+                                <!-- See: http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.8-WINDOW_UPDATE -->
+                                <Set name="initialWindowSize">65536</Set>
                             </New>
                         </Item>