[tomcat7] 01/03: Merge tag 'upstream/7.0.78'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 24 16:36:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 1def4a5e11877d943463b43b330f7e911fc451ff
Merge: c7c804e 309ce15
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 24 18:01:36 2017 +0200
Merge tag 'upstream/7.0.78'
Upstream version 7.0.78
BUILDING.txt | 32 +-
build.properties.default | 17 +-
build.xml | 35 +-
conf/catalina.properties | 4 +
conf/web.xml | 4 +
java/javax/el/BeanELResolver.java | 1 +
.../catalina/ant/AbstractCatalinaCommandTask.java | 24 +-
.../apache/catalina/ant/AbstractCatalinaTask.java | 84 ++--
.../catalina/authenticator/FormAuthenticator.java | 11 +-
.../apache/catalina/connector/CoyoteAdapter.java | 38 +-
.../catalina/connector/LocalStrings.properties | 2 +-
java/org/apache/catalina/connector/Request.java | 39 +-
.../catalina/core/ApplicationDispatcher.java | 4 -
.../org/apache/catalina/core/AsyncContextImpl.java | 5 +
.../catalina/core/DefaultInstanceManager.java | 35 +-
.../core/JreMemoryLeakPreventionListener.java | 2 +-
.../apache/catalina/core/LocalStrings.properties | 9 +-
.../catalina/core/LocalStrings_es.properties | 4 +-
.../catalina/core/LocalStrings_fr.properties | 2 +-
java/org/apache/catalina/core/StandardContext.java | 468 +++++++++++----------
.../apache/catalina/core/StandardHostValve.java | 20 +-
.../apache/catalina/deploy/LocalStrings.properties | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 19 +-
.../ha/authenticator/ClusterSingleSignOn.java | 9 +
.../ha/authenticator/mbeans-descriptors.xml | 4 +
.../catalina/ha/context/ReplicatedContext.java | 5 +-
.../catalina/ha/deploy/LocalStrings.properties | 4 +-
.../catalina/ha/session/LocalStrings.properties | 4 +-
.../catalina/ha/session/LocalStrings_es.properties | 2 +-
.../apache/catalina/ha/tcp/LocalStrings.properties | 2 +-
.../catalina/ha/tcp/LocalStrings_es.properties | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 65 ++-
.../apache/catalina/realm/LocalStrings.properties | 2 +-
.../catalina/security/SecurityClassLoad.java | 2 +
.../apache/catalina/servlets/DefaultServlet.java | 36 +-
.../apache/catalina/servlets/WebdavServlet.java | 17 +-
java/org/apache/catalina/ssi/SSIMediator.java | 23 +-
.../catalina/ssi/SSIServletExternalResolver.java | 28 +-
java/org/apache/catalina/startup/Catalina.java | 1 +
.../catalina/startup/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings_es.properties | 2 +-
.../startup/SafeForkJoinWorkerThreadFactory.java | 9 +
java/org/apache/catalina/startup/Tomcat.java | 5 +-
.../apache/catalina/tribes/group/RpcChannel.java | 3 +-
.../tribes/transport/LocalStrings.properties | 10 +-
.../tribes/transport/LocalStrings_es.properties | 2 +-
java/org/apache/catalina/util/ParameterMap.java | 198 +++++----
.../catalina/util/SessionIdGeneratorBase.java | 5 +-
java/org/apache/catalina/util/URLEncoder.java | 70 ++-
java/org/apache/coyote/AbstractProcessor.java | 12 +-
java/org/apache/coyote/AbstractProtocol.java | 8 +-
java/org/apache/coyote/AsyncStateMachine.java | 19 +-
java/org/apache/coyote/Constants.java | 4 +-
.../coyote/http11/AbstractHttp11Processor.java | 62 ++-
.../coyote/http11/AbstractHttp11Protocol.java | 62 ++-
.../apache/coyote/http11/Http11AprProcessor.java | 11 +-
.../apache/coyote/http11/Http11NioProcessor.java | 11 +-
java/org/apache/el/Messages.properties | 4 +-
java/org/apache/el/Messages_es.properties | 6 +-
java/org/apache/el/util/ReflectionUtil.java | 4 +-
java/org/apache/jasper/compiler/Generator.java | 82 ++--
.../jasper/resources/LocalStrings.properties | 54 +--
.../jasper/resources/LocalStrings_es.properties | 42 +-
.../jasper/resources/LocalStrings_fr.properties | 10 +-
.../jasper/resources/LocalStrings_ja.properties | 34 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 44 ++
java/org/apache/jasper/runtime/TagHandlerPool.java | 27 +-
.../naming/resources/LocalStrings.properties | 2 +-
java/org/apache/tomcat/util/ExceptionUtils.java | 11 +
java/org/apache/tomcat/util/bcel/Const.java | 15 +-
.../tomcat/util/bcel/classfile/Constant.java | 2 +
.../collections/ManagedConcurrentWeakHashMap.java | 273 ++++++++++++
java/org/apache/tomcat/util/compat/Jre8Compat.java | 3 +-
java/org/apache/tomcat/util/http/HttpMessages.java | 6 +
.../tomcat/util/http/LocalStrings.properties | 2 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 26 +-
.../util/http/parser/LocalStrings.properties | 16 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 37 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 32 +-
.../tomcat/util/net/SendfileKeepAliveState.java | 39 ++
.../tomcat/util/net/res/LocalStrings.properties | 4 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 4 +
.../websocket/AsyncChannelWrapperSecure.java | 2 +
.../tomcat/websocket/WsWebSocketContainer.java | 36 +-
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 | 19 +-
.../apache/tomcat/jdbc/pool/StatementFacade.java | 153 +++++++
.../AbstractCreateStatementInterceptor.java | 28 ++
.../jdbc/pool/interceptor/AbstractQueryReport.java | 23 -
.../interceptor/StatementDecoratorInterceptor.java | 24 --
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 16 +
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 6 +
.../eclipse/eclipse-websocket.classpath | 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 71 ++--
.../catalina/connector/TestKeepAliveCount.java | 2 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 21 +-
.../catalina/core/TestDefaultInstanceManager.java | 72 ++++
.../apache/catalina/startup/SimpleHttpClient.java | 22 +-
.../org/apache/catalina/util/TestParameterMap.java | 255 +++++++++++
test/org/apache/el/TestMethodExpressionImpl.java | 7 +
test/org/apache/tomcat/util/net/localhost-cert.pem | 122 +++---
.../org/apache/tomcat/util/net/localhost-copy1.jks | Bin 2197 -> 2196 bytes
test/org/apache/tomcat/util/net/localhost-key.pem | 52 +--
test/org/apache/tomcat/util/net/localhost.jks | Bin 2197 -> 2196 bytes
test/org/apache/tomcat/util/net/user1.jks | Bin 2194 -> 2193 bytes
webapps/docs/changelog.xml | 322 +++++++++++++-
webapps/docs/config/cluster-receiver.xml | 3 +
webapps/docs/config/cluster-valve.xml | 5 +
webapps/docs/config/filter.xml | 7 +
webapps/docs/config/http.xml | 2 +-
webapps/docs/config/systemprops.xml | 10 +
119 files changed, 2632 insertions(+), 1051 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list