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

435533 Handle 0 sized async gzip

This commit is contained in:
Greg Wilkins 2014-08-14 07:48:27 +10:00
parent 2af613a28b
commit 18b6a9b3d9
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/src/main/resources/jetty-logging.properties
View File

@ -8,3 +8,5 @@ org.eclipse.jetty.SOURCE=false
#org.eclipse.jetty.io.LEVEL=DEBUG
#org.eclipse.jetty.io.ssl.LEVEL=DEBUG
#org.eclipse.jetty.spdy.server.LEVEL=DEBUG
#org.eclipse.jetty.server.LEVEL=DEBUG
#org.eclipse.jetty.servlets.LEVEL=DEBUG

14
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java
View File

@ -304,6 +304,8 @@ public class GzipHttpOutput extends HttpOutput
if (!_complete)
return Action.SUCCEEDED;
_deflater.finish();
}
BufferUtil.compact(_buffer);
@ -353,6 +355,8 @@ public class GzipHttpOutput extends HttpOutput
{
return Action.SUCCEEDED;
}
_deflater.finish();
}
else
{
@ -377,15 +381,6 @@ public class GzipHttpOutput extends HttpOutput
int off=_buffer.arrayOffset()+_buffer.limit();
int len=_buffer.capacity()-_buffer.limit() - (_last?8:0);
int produced=_deflater.deflate(_buffer.array(),off,len,Deflater.NO_FLUSH);
if (produced==0)
{
LOG.warn(String.format("AsyncGzipFilter NO PROGRESS!!!! content=%s, input=%s, last=%b, deflater=%s finished=%b",
BufferUtil.toDetailString(_content),
BufferUtil.toDetailString(_input),
_last,
_deflater,
_deflater.finished()));
}
_buffer.limit(_buffer.limit()+produced);
boolean finished=_deflater.finished();
@ -396,6 +391,5 @@ public class GzipHttpOutput extends HttpOutput
superWrite(_buffer,finished,this);
return Action.SCHEDULED;
}
}
}