Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2015-11-02 06:17:00 -0500
committerSimone Bordet2015-11-02 06:17:00 -0500
commit5062756135ea9defee1452b3a443769ee5976616 (patch)
treecbe7def83f786bef505737558ffb5d3ca7e5aaa4 /jetty-servlets
parenta022c77dabd4165fc5797aaf76b2c3755d363950 (diff)
parent58027a3421cabe1f3e6331ea3145ba2cbc5b305b (diff)
downloadorg.eclipse.jetty.project-5062756135ea9defee1452b3a443769ee5976616.tar.gz
org.eclipse.jetty.project-5062756135ea9defee1452b3a443769ee5976616.tar.xz
org.eclipse.jetty.project-5062756135ea9defee1452b3a443769ee5976616.zip
Merged branch 'jetty-9.3.x' into 'master'.
Diffstat (limited to 'jetty-servlets')
-rw-r--r--jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java9
1 files changed, 5 insertions, 4 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 aa6e66be2f..544c392a9c 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
@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -45,7 +44,6 @@ import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.HttpVersion;
-import org.eclipse.jetty.server.Dispatcher;
import org.eclipse.jetty.server.PushBuilder;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.util.StringUtil;
@@ -158,6 +156,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);
@@ -254,12 +255,12 @@ public class PushCacheFilter implements Filter
if (!conditional && !primaryResource._associated.isEmpty())
{
PushBuilder builder = Request.getBaseRequest(request).getPushBuilder();
-
+
for (String associated : primaryResource._associated.values())
{
if (LOG.isDebugEnabled())
LOG.debug("Pushing {} for {}", associated, path);
-
+
builder.path(associated).push();
}
}

Back to the top