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' into jetty-9.3.x

This commit is contained in:
Greg Wilkins 2016-09-21 14:00:49 +10:00
parent 43b134a6ec 534fb8c427
commit 4fca2bf8af
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -870,8 +870,12 @@ public class HttpOutput extends ServletOutputStream implements Runnable
public void recycle()
{
_interceptor = _channel;
if (BufferUtil.hasContent(_aggregate))
BufferUtil.clear(_aggregate);
HttpConfiguration config = _channel.getHttpConfiguration();
_bufferSize = config.getOutputBufferSize();
_commitSize = config.getOutputAggregationSize();
if (_commitSize > _bufferSize)
_commitSize = _bufferSize;
releaseBuffer();
_written = 0;
reopen();
}