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

This commit is contained in:
Greg Wilkins 2016-04-07 11:41:29 +10:00
commit 21e4cfecfc

View File

@ -293,23 +293,20 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory
return null; return null;
} }
// If not HTTP/2, then we must check the accept encoding header // check the accept encoding header
if (request.getHttpVersion()!=HttpVersion.HTTP_2) HttpField accept = request.getHttpFields().getField(HttpHeader.ACCEPT_ENCODING);
if (accept==null)
{ {
HttpField accept = request.getHttpFields().getField(HttpHeader.ACCEPT_ENCODING); LOG.debug("{} excluded !accept {}",this,request);
return null;
}
boolean gzip = accept.contains("gzip");
if (accept==null) if (!gzip)
{ {
LOG.debug("{} excluded !accept {}",this,request); LOG.debug("{} excluded not gzip accept {}",this,request);
return null; return null;
}
boolean gzip = accept.contains("gzip");
if (!gzip)
{
LOG.debug("{} excluded not gzip accept {}",this,request);
return null;
}
} }
Deflater df = _deflater.get(); Deflater df = _deflater.get();