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

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.
This commit is contained in:
Simone Bordet 2015-11-02 11:36:30 +01:00
parent b3b48924d5
commit 58027a3421
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,6 +695,10 @@ public class PushCacheFilterTest extends AbstractTest
@Override
public Stream.Listener onPush(Stream stream, PushPromiseFrame frame)
{
MetaData metaData = frame.getMetaData();
Assert.assertTrue(metaData instanceof MetaData.Request);
MetaData.Request pushedRequest = (MetaData.Request)metaData;
Assert.assertEquals(servletPath + secondaryResource, pushedRequest.getURI().getPathQuery());
return new Adapter()
{
@Override

32
jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java
View File

@ -129,7 +129,7 @@ public class Dispatcher implements RequestDispatcher
protected void forward(ServletRequest request, ServletResponse response, DispatcherType dispatch) throws ServletException, IOException
{
Request baseRequest=Request.getBaseRequest(request);
Request baseRequest=Request.getBaseRequest(request);
Response base_response=baseRequest.getResponse();
base_response.resetForForward();
@ -139,12 +139,12 @@ public class Dispatcher implements RequestDispatcher
response = new ServletResponseHttpWrapper(response);
final boolean old_handled=baseRequest.isHandled();
final HttpURI old_uri=baseRequest.getHttpURI();
final String old_context_path=baseRequest.getContextPath();
final String old_servlet_path=baseRequest.getServletPath();
final String old_path_info=baseRequest.getPathInfo();
final MultiMap<String> old_query_params=baseRequest.getQueryParameters();
final Attributes old_attr=baseRequest.getAttributes();
final DispatcherType old_type=baseRequest.getDispatcherType();
@ -182,18 +182,18 @@ public class Dispatcher implements RequestDispatcher
attr._contextPath=old_context_path;
attr._servletPath=old_servlet_path;
}
HttpURI uri = new HttpURI(old_uri.getScheme(),old_uri.getHost(),old_uri.getPort(),
_uri.getPath(),_uri.getParam(),_uri.getQuery(),_uri.getFragment());
baseRequest.setHttpURI(uri);
baseRequest.setContextPath(_contextHandler.getContextPath());
baseRequest.setServletPath(null);
baseRequest.setPathInfo(_pathInContext);
if (_uri.getQuery()!=null || old_uri.getQuery()!=null)
baseRequest.mergeQueryParameters(old_uri.getQuery(),_uri.getQuery(), true);
baseRequest.setAttributes(attr);
_contextHandler.handle(_pathInContext, baseRequest, (HttpServletRequest)request, (HttpServletResponse)response);
@ -215,13 +215,19 @@ public class Dispatcher implements RequestDispatcher
baseRequest.setDispatcherType(old_type);
}
}
/**
* <p>Pushes a secondary resource identified by this dispatcher.</p>
*
* @param request the primary request
* @deprecated Use {@link Request#getPushBuilder()} instead
*/
@Deprecated
public void push(ServletRequest request)
{
Request baseRequest = Request.getBaseRequest(request);
HttpFields fields = new HttpFields(baseRequest.getHttpFields());
String query=baseRequest.getQueryString();
if (_uri.hasQuery())
{
@ -230,14 +236,14 @@ public class Dispatcher implements RequestDispatcher
else
query=query+"&"+_uri.getQuery(); // TODO is this correct semantic?
}
HttpURI uri = HttpURI.createHttpURI(request.getScheme(),request.getServerName(),request.getServerPort(),_uri.getPath(),baseRequest.getHttpURI().getParam(),query,null);
MetaData.Request push = new MetaData.Request(HttpMethod.GET.asString(),uri,baseRequest.getHttpVersion(),fields);
baseRequest.getHttpChannel().getHttpTransport().push(push);
}
@Override
public String toString()
{

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

@ -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);