[tomcat8] 01/04: Merge tag 'upstream/8.5.9'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 7 15:29:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 7c15ea89bf6cf7c3e2feff2623fdb99032991cf5
Merge: 2beba53 cfa2728
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Dec 5 22:40:50 2016 +0100
Merge tag 'upstream/8.5.9'
Upstream version 8.5.9
BUILDING.txt | 7 +-
bin/catalina.bat | 10 +-
bin/service.bat | 11 +-
build.properties.default | 6 +-
build.xml | 2 +-
conf/server.xml | 15 +-
java/org/apache/catalina/AccessLog.java | 3 +-
java/org/apache/catalina/Realm.java | 8 +
.../catalina/authenticator/AuthenticatorBase.java | 12 +
.../catalina/authenticator/LocalStrings.properties | 1 +
.../org/apache/catalina/connector/InputBuffer.java | 2 +
java/org/apache/catalina/core/ContainerBase.java | 17 +-
java/org/apache/catalina/core/StandardContext.java | 19 --
.../apache/catalina/core/StandardContextValve.java | 12 -
java/org/apache/catalina/core/StandardEngine.java | 13 --
java/org/apache/catalina/core/StandardHost.java | 18 --
java/org/apache/catalina/core/StandardWrapper.java | 19 --
java/org/apache/catalina/realm/CombinedRealm.java | 14 ++
.../org/apache/catalina/realm/DataSourceRealm.java | 26 ++-
.../apache/catalina/realm/GenericPrincipal.java | 3 +
java/org/apache/catalina/realm/JAASRealm.java | 11 +-
java/org/apache/catalina/realm/JDBCRealm.java | 16 +-
java/org/apache/catalina/realm/JNDIRealm.java | 14 +-
.../apache/catalina/realm/LocalStrings.properties | 1 +
java/org/apache/catalina/realm/LockOutRealm.java | 2 +-
java/org/apache/catalina/realm/MemoryRealm.java | 10 +-
java/org/apache/catalina/realm/NullRealm.java | 1 +
java/org/apache/catalina/realm/RealmBase.java | 15 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 10 +-
.../org/apache/catalina/startup/ContextConfig.java | 2 +-
java/org/apache/catalina/startup/ExpandWar.java | 14 +-
java/org/apache/catalina/startup/Tomcat.java | 44 +++-
.../apache/catalina/storeconfig/StoreAppender.java | 2 +-
.../interceptors/DomainFilterInterceptor.java | 18 +-
.../tribes/tipis/AbstractReplicatedMap.java | 3 +
java/org/apache/catalina/util/TomcatCSS.java | 25 +--
.../catalina/valves/AbstractAccessLogValve.java | 4 +
.../apache/catalina/valves/JDBCAccessLogValve.java | 4 +
.../catalina/valves/rewrite/RewriteRule.java | 24 +-
.../catalina/valves/rewrite/RewriteValve.java | 34 ++-
.../catalina/valves/rewrite/Substitution.java | 12 +-
.../webresources/AbstractArchiveResource.java | 12 +-
.../apache/catalina/webresources/JarResource.java | 2 +-
.../apache/catalina/webresources/WarResource.java | 18 +-
java/org/apache/coyote/AbstractProcessor.java | 65 ++++--
java/org/apache/coyote/AbstractProtocol.java | 8 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 6 -
.../coyote/http11/AbstractHttp11Protocol.java | 16 +-
.../apache/coyote/http11/Http11OutputBuffer.java | 11 +-
java/org/apache/coyote/http11/Http11Processor.java | 6 -
.../apache/coyote/http11/LocalStrings.properties | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 3 +
java/org/apache/coyote/http2/AbstractStream.java | 10 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 128 +++++++++--
java/org/apache/coyote/http2/Stream.java | 28 ++-
java/org/apache/coyote/http2/StreamProcessor.java | 38 +++-
java/org/apache/coyote/http2/StreamRunnable.java | 37 ++++
java/org/apache/el/parser/AstFunction.java | 12 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 86 +++++++-
.../tomcat/util/net/AbstractJsseEndpoint.java | 41 ++++
java/org/apache/tomcat/util/net/AprEndpoint.java | 51 ++++-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 30 +--
java/org/apache/tomcat/util/net/NioEndpoint.java | 32 +--
.../apache/tomcat/util/net/SSLImplementation.java | 2 +
.../apache/tomcat/util/net/SocketWrapperBase.java | 26 ---
.../tomcat/util/net/jsse/JSSEImplementation.java | 6 +
.../util/net/openssl/OpenSSLImplementation.java | 5 +
.../websocket/AsyncChannelWrapperSecure.java | 2 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 9 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 74 +++++++
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 83 +++++++
.../apache/tomcat/jdbc/pool/PooledConnection.java | 23 ++
.../jdbc/pool/interceptor/StatementCache.java | 7 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 35 +++
.../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java | 14 ++
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 35 +++
.../tomcat/jdbc/test/TestSlowQueryReport.java | 2 +-
res/findbugs/filter-false-positives.xml | 31 ++-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-catalina.pom | 6 +
.../apache/catalina/connector/TestInputBuffer.java | 40 ++++
.../apache/catalina/connector/TestSendFile.java | 131 +++++++++--
.../core/TestStandardContextResources.java | 5 +-
.../filters/TestRestCsrfPreventionFilter2.java | 2 +-
test/org/apache/catalina/startup/TestTomcat.java | 32 +++
.../apache/catalina/startup/TesterMapRealm.java | 1 +
.../catalina/valves/rewrite/TestRewriteValve.java | 124 +++++++++++
.../webresources/TestAbstractArchiveResource.java | 77 +++++++
.../webresources/TestJarInputStreamWrapper.java | 140 ++++++++++++
.../apache/coyote/http11/TestHttp11Processor.java | 4 +
test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
.../apache/coyote/http2/TestStreamProcessor.java | 170 +++++++++++++++
test/org/apache/el/TestELEvaluation.java | 47 ++--
test/org/apache/el/TestELInJsp.java | 11 +
test/org/apache/el/TesterFunctions.java | 66 ++++++
.../jasper/compiler/TestAttributeParser.java | 24 +-
.../TestOpenSSLCipherConfigurationParser.java | 8 +-
test/webapp/WEB-INF/test.tld | 8 +
test/webapp/bug6nnnn/bug60431.jsp | 25 +++
webapps/docs/changelog.xml | 241 ++++++++++++++++++++-
webapps/docs/config/cluster-interceptor.xml | 4 +
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 21 +-
webapps/docs/rewrite.xml | 11 +-
104 files changed, 2180 insertions(+), 504 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