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.2.x' 

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
This commit is contained in:
Greg Wilkins 2015-05-22 10:50:33 +10:00
parent 68412d1958 ac7b515915
commit 4028df12ca
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
View File

@ -348,9 +348,11 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor
BufferUtil.compact(_buffer); BufferUtil.compact(_buffer);
int off=_buffer.arrayOffset()+_buffer.limit(); int off=_buffer.arrayOffset()+_buffer.limit();
int len=_buffer.capacity()-_buffer.limit() - (_last?8:0); int len=_buffer.capacity()-_buffer.limit() - (_last?8:0);
if (len>0)
{
int produced=_deflater.deflate(_buffer.array(),off,len,Deflater.NO_FLUSH); int produced=_deflater.deflate(_buffer.array(),off,len,Deflater.NO_FLUSH);
_buffer.limit(_buffer.limit()+produced); _buffer.limit(_buffer.limit()+produced);
}
boolean finished=_deflater.finished(); boolean finished=_deflater.finished();
if (finished) if (finished)