Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2017-03-09 16:39:30 +11:00
parent 18d87aa972 2219863c11
commit 9ccf0a5337
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/PushCacheFilterTest.java
View File

@ -740,7 +740,7 @@ public class PushCacheFilterTest extends AbstractTest
{ {
String name = "foo"; String name = "foo";
String value = "bar"; String value = "bar";
final String primaryResource = "/primary.html"; final String primaryResource = "/primary.html?"+name + "=" +value;
final String secondaryResource = "/secondary.html?" + name + "=" + value; final String secondaryResource = "/secondary.html?" + name + "=" + value;
start(new HttpServlet() start(new HttpServlet()
{ {

9
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
View File

@ -71,6 +71,8 @@ import org.eclipse.jetty.util.log.Logger;
* secondary resources are pushed to the client, unless the request carries * secondary resources are pushed to the client, unless the request carries
* {@code If-xxx} header that hint that the client has the resources in its * {@code If-xxx} header that hint that the client has the resources in its
* cache.</p> * cache.</p>
* <p>If the init param useQueryInKey is set, then the query string is used as
* as part of the key to identify a resource</p>
*/ */
@ManagedObject("Push cache based on the HTTP 'Referer' header") @ManagedObject("Push cache based on the HTTP 'Referer' header")
public class PushCacheFilter implements Filter public class PushCacheFilter implements Filter
@ -83,6 +85,7 @@ public class PushCacheFilter implements Filter
private long _associatePeriod = 4000L; private long _associatePeriod = 4000L;
private int _maxAssociations = 16; private int _maxAssociations = 16;
private long _renew = System.nanoTime(); private long _renew = System.nanoTime();
private boolean _useQueryInKey;
@Override @Override
public void init(FilterConfig config) throws ServletException public void init(FilterConfig config) throws ServletException
@ -104,6 +107,8 @@ public class PushCacheFilter implements Filter
for (String p : StringUtil.csvSplit(ports)) for (String p : StringUtil.csvSplit(ports))
_ports.add(Integer.parseInt(p)); _ports.add(Integer.parseInt(p));
_useQueryInKey = Boolean.parseBoolean(config.getInitParameter("useQueryInKey"));
// Expose for JMX. // Expose for JMX.
config.getServletContext().setAttribute(config.getFilterName(), this); config.getServletContext().setAttribute(config.getFilterName(), this);
@ -162,7 +167,7 @@ public class PushCacheFilter implements Filter
String path = request.getRequestURI(); String path = request.getRequestURI();
String query = request.getQueryString(); String query = request.getQueryString();
if (query != null) if (_useQueryInKey && query != null)
path += "?" + query; path += "?" + query;
if (referrer != null) if (referrer != null)
{ {
@ -179,7 +184,7 @@ public class PushCacheFilter implements Filter
{ {
if (HttpMethod.GET.is(request.getMethod())) if (HttpMethod.GET.is(request.getMethod()))
{ {
String referrerPath = referrerURI.getPath(); String referrerPath = _useQueryInKey?referrerURI.getPathQuery():referrerURI.getPath();
if (referrerPath == null) if (referrerPath == null)
referrerPath = "/"; referrerPath = "/";
if (referrerPath.startsWith(request.getContextPath() + "/")) if (referrerPath.startsWith(request.getContextPath() + "/"))