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

This commit is contained in:
Greg Wilkins 2016-09-21 14:01:27 +10:00
parent d8d9a5c5b7 4fca2bf8af
commit b164298b99
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VERSION.txt
View File

@ -231,10 +231,8 @@ jetty-9.3.12.v20160915 - 15 September 2016
+ 185 Implement RFC 7239 (Forwarded header) + 185 Implement RFC 7239 (Forwarded header)
+ 700 Bundle org.eclipse.jetty.http.spi not available via p2 repository + 700 Bundle org.eclipse.jetty.http.spi not available via p2 repository
+ 725 Provide a private way to report security issues + 725 Provide a private way to report security issues
+ 732 Add jetty-documentation into jetty distribution under demo-base
+ 752 Implement support for HTTP2 SETTINGS_MAX_HEADER_LIST_SIZE + 752 Implement support for HTTP2 SETTINGS_MAX_HEADER_LIST_SIZE
+ 759 Ensure wrapped Responses will close and commit outputstream or writer + 759 Ensure wrapped Responses will close and commit outputstream or writer
+ 761 Clarify retainDays for NCSARequestLog in documentation
+ 780 The moved websocket PathSpec is incompatible with cometd 3.0.x + 780 The moved websocket PathSpec is incompatible with cometd 3.0.x
+ 783 Report name of broken jar file + 783 Report name of broken jar file
+ 784 JSP Session updated before sendRedirect() lose their information + 784 JSP Session updated before sendRedirect() lose their information
@ -261,7 +259,6 @@ jetty-9.3.12.v20160915 - 15 September 2016
+ 860 Only TLS 1.2 Supported + 860 Only TLS 1.2 Supported
+ 868 ClassLoader leak with Jetty and Karaf - static instances of + 868 ClassLoader leak with Jetty and Karaf - static instances of
java.lang.Throwable java.lang.Throwable
+ 872 override-web.xml configured inside webapp's jetty-web.xml is ignored
+ 880 Refactor jetty-http's HostPortHttpField logic into new jetty-util class + 880 Refactor jetty-http's HostPortHttpField logic into new jetty-util class
+ 882 Add IPv6 support to IPAddressMap in jetty-util + 882 Add IPv6 support to IPAddressMap in jetty-util
+ 889 ConstantThrowable.name can be removed + 889 ConstantThrowable.name can be removed

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

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