Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-11-02 05:36:30 -0500
committerSimone Bordet2015-11-02 05:37:17 -0500
commit58027a3421cabe1f3e6331ea3145ba2cbc5b305b (patch)
tree485a7c429aef928ec88aa60efc794689666f0a68 /jetty-servlets
parentb3b48924d53c7528aa495730ceceb3e8999fb985 (diff)
downloadorg.eclipse.jetty.project-58027a3421cabe1f3e6331ea3145ba2cbc5b305b.tar.gz
org.eclipse.jetty.project-58027a3421cabe1f3e6331ea3145ba2cbc5b305b.tar.xz
org.eclipse.jetty.project-58027a3421cabe1f3e6331ea3145ba2cbc5b305b.zip
481225 - Secondary resources with query parameters are not properly pushed.
Fixed by making PushCacheFilter remember the query parameters for secondary resources, so that the PUSH_PROMISE frame can be correctly generated with the query parameters.
Diffstat (limited to 'jetty-servlets')
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
index d6710d74db..44db8aecf3 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
@@ -157,6 +157,9 @@ public class PushCacheFilter implements Filter
LOG.debug("{} {} referrer={} conditional={}", request.getMethod(), request.getRequestURI(), referrer, conditional);
String path = URIUtil.addPaths(request.getServletPath(), request.getPathInfo());
+ String query = request.getQueryString();
+ if (query != null)
+ path += "?" + query;
if (referrer != null)
{
HttpURI referrerURI = new HttpURI(referrer);

Back to the top