Merge "spdy: move x-spdy-push header to internal request. fix StandardStream.toString()"

3 files changed, 3 insertions, 4 deletions

diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
index b4d0c60edf..a99536fa1f 100644
--- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
+++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java
@@ -440,7 +440,7 @@ public class StandardStream implements IStream
     @Override
     public String toString()
     {
-        return String.format("stream=%d v%d windowSize=%db reset=%s %s %s", getId(), session.getVersion(), windowSize, isReset(), openState, closeState);
+        return String.format("stream=%d v%d windowSize=%db reset=%s %s %s", getId(), session.getVersion(), getWindowSize(), isReset(), openState, closeState);
     }
 
     private boolean canSend()
diff --git a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
index 6f7ca5aedb..4e3d0ae247 100644
--- a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
+++ b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
@@ -444,6 +444,7 @@ public class ServerHTTPSPDYAsyncConnection extends AbstractHttpConnection implem
         requestHeaders.put("referer", referrer);
         // Remember support for gzip encoding
         requestHeaders.put(headers.get("accept-encoding"));
+        requestHeaders.put("x-spdy-push", "true");
         return requestHeaders;
     }
 
@@ -460,7 +461,6 @@ public class ServerHTTPSPDYAsyncConnection extends AbstractHttpConnection implem
         }
         pushHeaders.put(HTTPSPDYHeader.STATUS.name(version), "200");
         pushHeaders.put(HTTPSPDYHeader.VERSION.name(version), "HTTP/1.1");
-        pushHeaders.put("x-spdy-push", "true");
         return pushHeaders;
     }
 
diff --git a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyV2Test.java b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyV2Test.java
index cc2435ed4f..ab24521bea 100644
--- a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyV2Test.java
+++ b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyV2Test.java
@@ -748,8 +748,7 @@ public class ReferrerPushStrategyV2Test extends AbstractHTTPSPDYTest
     {
         if (validateHeader(headers, HTTPSPDYHeader.STATUS.name(version()), "200")
                 && validateHeader(headers, HTTPSPDYHeader.VERSION.name(version()), "HTTP/1.1")
-                && validateUriHeader(headers)
-                && validateHeader(headers, "x-spdy-push", "true"))
+                && validateUriHeader(headers))
             pushSynHeadersValid.countDown();
     }