svn commit: r1716696 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java

[ma...@apache.org]

Author: markt
Date: Thu Nov 26 14:36:13 2015
New Revision: 1716696

URL: http://svn.apache.org/viewvc?rev=1716696&view=rev
Log:
Include the query string when pushing requests to the client

Modified:
    tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1716696&r1=1716695&r2=1716696&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Nov 26 14:36:13 2015
@@ -386,8 +386,12 @@ public class Stream extends AbstractStre
         // Set the special HTTP/2 headers
         request.getMimeHeaders().addValue(":method").duplicate(request.method());
         request.getMimeHeaders().addValue(":scheme").duplicate(request.scheme());
-        // TODO: Query string
-        request.getMimeHeaders().addValue(":path").duplicate(request.decodedURI());
+        StringBuilder path = new StringBuilder(request.requestURI().toString());
+        if (!request.queryString().isNull()) {
+            path.append('?');
+            path.append(request.queryString().toString());
+        }
+        request.getMimeHeaders().addValue(":path").setString(path.toString());
 
         // Authority needs to include the port only if a non-standard port is
         // being used.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org