[tomcat8] 01/04: Merge tag 'upstream/8.5.13'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun May 7 23:19:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit ce321f189361cd6e97a7df646776ed48c4c199fd
Merge: 3403191 5cf4acb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Apr 21 00:43:28 2017 +0200
Merge tag 'upstream/8.5.13'
Upstream version 8.5.13
build.properties.default | 11 +-
build.xml | 13 +-
.../catalina/ant/AbstractCatalinaCommandTask.java | 12 +-
.../apache/catalina/ant/AbstractCatalinaTask.java | 74 +++----
.../catalina/ant/BaseRedirectorHelperTask.java | 146 +++++++-------
java/org/apache/catalina/ant/DeployTask.java | 47 ++---
.../apache/catalina/connector/CoyoteAdapter.java | 14 +-
.../apache/catalina/core/ApplicationMapping.java | 8 +-
.../catalina/core/ApplicationPushBuilder.java | 60 +-----
java/org/apache/catalina/core/StandardContext.java | 13 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 19 +-
.../catalina/manager/host/HostManagerServlet.java | 10 +-
.../apache/catalina/security/SecurityListener.java | 15 +-
.../catalina/servlet4preview/http/PushBuilder.java | 61 ------
.../org/apache/catalina/startup/ContextConfig.java | 2 +-
java/org/apache/catalina/users/MemoryGroup.java | 16 +-
java/org/apache/catalina/users/MemoryUser.java | 58 ++----
java/org/apache/coyote/AbstractProcessorLight.java | 6 +-
java/org/apache/coyote/AbstractProtocol.java | 86 +++++++--
java/org/apache/coyote/Constants.java | 11 ++
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +
java/org/apache/coyote/ajp/AjpProcessor.java | 32 +++-
.../coyote/http11/AbstractHttp11Protocol.java | 212 ++++++++++++++++++---
java/org/apache/coyote/http11/Constants.java | 8 +-
.../apache/coyote/http11/Http11OutputBuffer.java | 71 ++++++-
java/org/apache/coyote/http11/Http11Processor.java | 99 ++++++----
.../apache/coyote/http2/ConnectionException.java | 7 +-
java/org/apache/coyote/http2/HPackHuffman.java | 11 +-
java/org/apache/coyote/http2/HpackDecoder.java | 37 ++--
java/org/apache/coyote/http2/Http2Exception.java | 10 +-
java/org/apache/coyote/http2/Http2Parser.java | 2 +-
java/org/apache/coyote/http2/Http2Protocol.java | 21 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 39 +++-
.../apache/coyote/http2/LocalStrings.properties | 10 +
java/org/apache/coyote/http2/Stream.java | 111 +++++++++--
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
java/org/apache/el/util/ReflectionUtil.java | 4 +-
java/org/apache/jasper/compiler/Generator.java | 16 +-
java/org/apache/tomcat/buildutil/SignCode.java | 18 +-
java/org/apache/tomcat/util/buf/StringUtils.java | 87 +++++++++
java/org/apache/tomcat/util/http/HttpMessages.java | 150 +++++++++++++++
java/org/apache/tomcat/util/http/Parameters.java | 6 +-
.../tomcat/util/http/Rfc6265CookieProcessor.java | 12 +-
.../tomcat/util/http/res/LocalStrings.properties | 78 ++++++++
.../util/http/res/LocalStrings_es.properties | 61 ++++++
.../util/http/res/LocalStrings_fr.properties | 61 ++++++
.../apache/tomcat/util/modeler/ManagedBean.java | 20 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 90 +++++----
java/org/apache/tomcat/util/net/AprEndpoint.java | 47 +++--
.../apache/tomcat/util/net/LocalStrings.properties | 4 +-
.../tomcat/util/net/LocalStrings_es.properties | 2 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 25 ++-
java/org/apache/tomcat/util/net/NioEndpoint.java | 26 ++-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 40 ++++
.../apache/tomcat/util/net/SendfileDataBase.java | 6 +-
.../util/net/SendfileKeepAliveState.java} | 32 ++--
.../apache/tomcat/util/net/SocketWrapperBase.java | 6 +-
.../tomcat/websocket/WsWebSocketContainer.java | 13 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 7 +
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 5 +-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 10 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 16 ++
.../jdbc/pool/DisposableConnectionFacade.java | 2 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 14 ++
.../apache/tomcat/jdbc/pool/PoolProperties.java | 17 ++
.../apache/tomcat/jdbc/pool/StatementFacade.java | 177 +++++++++++++++++
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 16 ++
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 6 +
res/findbugs/filter-false-positives.xml | 6 +
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 69 ++++---
.../catalina/core/TestApplicationMapping.java | 10 +
.../coyote/http11/filters/TesterOutputBuffer.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 3 +
test/org/apache/coyote/http2/TestHpack.java | 19 ++
test/org/apache/coyote/http2/TestHttp2Limits.java | 17 +-
.../apache/coyote/http2/TestHttp2Section_8_1.java | 9 +-
test/org/apache/el/TestMethodExpressionImpl.java | 7 +
test/org/apache/tomcat/util/buf/TestByteChunk.java | 2 +-
.../util/http/TestCookieProcessorGeneration.java | 11 +-
test/webapp/WEB-INF/tags/bug42390.tag | 2 +-
test/webapp/bug48nnn/bug48616b.jsp | 3 +
webapps/docs/changelog.xml | 142 +++++++++++++-
webapps/docs/config/ajp.xml | 8 +
webapps/docs/config/filter.xml | 7 +
webapps/docs/config/http.xml | 10 +-
webapps/docs/config/systemprops.xml | 11 ++
.../WEB-INF/classes/http2/SimpleImagePush.java | 32 ++--
88 files changed, 2051 insertions(+), 755 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list