[tomcat8] 01/03: Merge tag 'upstream/8.5.15'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 21 11:48:53 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 7c097d19d6d02da1ddfdabea75f712d12bdff86c
Merge: a1e2c41 33d727d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 21 12:59:37 2017 +0200
Merge tag 'upstream/8.5.15'
Upstream version 8.5.15
BUILDING.txt | 8 +-
build.properties.default | 6 +-
build.xml | 2 +
conf/web.xml | 4 +
java/javax/el/ExpressionFactory.java | 5 +-
java/javax/el/ImportHandler.java | 2 +-
java/javax/el/LocalStrings.properties | 10 +-
java/javax/el/LocalStrings_es.properties | 10 +-
.../auth/message/config/AuthConfigFactory.java | 6 +-
java/javax/servlet/LocalStrings.properties | 2 +-
java/javax/servlet/LocalStrings_es.properties | 2 +-
java/javax/servlet/LocalStrings_fr.properties | 2 +-
java/javax/servlet/LocalStrings_ja.properties | 2 +-
java/javax/servlet/http/LocalStrings.properties | 4 +-
java/javax/servlet/http/LocalStrings_es.properties | 4 +-
java/javax/servlet/http/LocalStrings_fr.properties | 6 +-
java/javax/servlet/http/LocalStrings_ja.properties | 4 +-
java/javax/websocket/ContainerProvider.java | 8 +-
.../websocket/server/ServerEndpointConfig.java | 8 +-
.../apache/catalina/ant/AbstractCatalinaTask.java | 5 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 12 +-
java/org/apache/catalina/ant/FindLeaksTask.java | 3 +-
.../catalina/authenticator/AuthenticatorBase.java | 6 +-
.../catalina/authenticator/FormAuthenticator.java | 2 -
.../authenticator/LocalStrings_es.properties | 2 +-
.../jaspic/SimpleServerAuthConfig.java | 9 +-
java/org/apache/catalina/connector/Connector.java | 55 ++-
.../apache/catalina/connector/CoyoteAdapter.java | 24 +-
.../org/apache/catalina/connector/InputBuffer.java | 24 +-
.../catalina/connector/LocalStrings.properties | 2 +
.../catalina/connector/LocalStrings_es.properties | 6 +-
.../apache/catalina/connector/OutputBuffer.java | 25 +-
java/org/apache/catalina/connector/Request.java | 114 +++---
java/org/apache/catalina/connector/Response.java | 41 +-
.../apache/catalina/core/ApplicationContext.java | 12 +-
.../catalina/core/ApplicationFilterConfig.java | 18 +-
.../catalina/core/ApplicationHttpRequest.java | 20 +-
.../catalina/core/ApplicationPushBuilder.java | 25 +-
.../core/ApplicationServletRegistration.java | 3 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 3 +-
.../catalina/core/DefaultInstanceManager.java | 17 +-
.../apache/catalina/core/LocalStrings.properties | 168 ++++----
.../catalina/core/LocalStrings_es.properties | 144 +++----
.../catalina/core/LocalStrings_fr.properties | 92 ++---
.../catalina/core/LocalStrings_ja.properties | 96 ++---
java/org/apache/catalina/core/StandardContext.java | 20 +-
java/org/apache/catalina/core/StandardHost.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 5 +-
.../catalina/filters/LocalStrings.properties | 40 +-
.../catalina/filters/LocalStrings_es.properties | 32 +-
.../catalina/filters/LocalStrings_fr.properties | 2 +-
.../catalina/ha/context/ReplicatedContext.java | 2 +-
.../catalina/ha/deploy/LocalStrings.properties | 10 +-
.../catalina/ha/session/LocalStrings.properties | 48 +--
.../catalina/ha/session/LocalStrings_es.properties | 82 ++--
.../apache/catalina/ha/tcp/LocalStrings.properties | 26 +-
.../catalina/ha/tcp/LocalStrings_es.properties | 22 +-
.../apache/catalina/loader/LocalStrings.properties | 20 +-
.../catalina/loader/LocalStrings_es.properties | 18 +-
.../catalina/loader/LocalStrings_fr.properties | 8 +-
.../catalina/loader/LocalStrings_ja.properties | 10 +-
.../catalina/manager/HTMLManagerServlet.java | 18 +-
.../catalina/manager/LocalStrings.properties | 58 +--
.../catalina/manager/LocalStrings_de.properties | 44 +-
.../catalina/manager/LocalStrings_es.properties | 74 ++--
.../catalina/manager/LocalStrings_fr.properties | 62 +--
.../catalina/manager/LocalStrings_ja.properties | 46 +--
.../catalina/manager/host/LocalStrings.properties | 36 +-
.../manager/host/LocalStrings_es.properties | 56 +--
.../apache/catalina/mbeans/LocalStrings.properties | 10 +-
.../catalina/mbeans/LocalStrings_fr.properties | 10 +-
.../apache/catalina/realm/LocalStrings.properties | 96 ++---
.../catalina/realm/LocalStrings_es.properties | 78 ++--
.../catalina/realm/LocalStrings_fr.properties | 40 +-
.../catalina/realm/LocalStrings_ja.properties | 44 +-
.../apache/catalina/servlets/DefaultServlet.java | 32 +-
.../catalina/servlets/LocalStrings.properties | 8 +-
.../catalina/servlets/LocalStrings_es.properties | 10 +-
.../catalina/servlets/LocalStrings_fr.properties | 4 +-
.../catalina/servlets/LocalStrings_ja.properties | 4 +-
.../apache/catalina/servlets/WebdavServlet.java | 11 +-
.../catalina/session/LocalStrings.properties | 54 +--
.../catalina/session/LocalStrings_es.properties | 72 ++--
.../catalina/session/LocalStrings_fr.properties | 46 +--
.../catalina/session/LocalStrings_ja.properties | 46 +--
java/org/apache/catalina/ssi/SSIMediator.java | 20 +-
.../catalina/ssi/SSIServletExternalResolver.java | 43 +-
java/org/apache/catalina/startup/EngineConfig.java | 2 +-
.../catalina/startup/LocalStrings.properties | 82 ++--
.../catalina/startup/LocalStrings_es.properties | 96 ++---
.../catalina/startup/LocalStrings_fr.properties | 46 +--
.../catalina/startup/LocalStrings_ja.properties | 48 +--
.../catalina/storeconfig/LocalStrings.properties | 6 +-
.../catalina/tribes/group/LocalStrings.properties | 8 +-
.../group/interceptors/LocalStrings.properties | 8 +-
.../catalina/tribes/io/LocalStrings.properties | 6 +-
.../tribes/membership/LocalStrings.properties | 26 +-
.../catalina/tribes/tipis/LocalStrings.properties | 22 +-
.../tribes/transport/LocalStrings.properties | 10 +-
.../tribes/transport/LocalStrings_es.properties | 16 +-
.../tribes/transport/bio/BioReplicationTask.java | 2 +-
.../tribes/transport/bio/LocalStrings.properties | 4 +-
.../tribes/transport/nio/LocalStrings.properties | 22 +-
.../catalina/tribes/util/LocalStrings.properties | 2 +-
java/org/apache/catalina/tribes/util/Logs.java | 2 +-
.../apache/catalina/users/LocalStrings.properties | 6 +-
.../catalina/users/LocalStrings_es.properties | 6 +-
.../catalina/users/LocalStrings_fr.properties | 6 +-
.../catalina/users/LocalStrings_ja.properties | 6 +-
.../catalina/util/LocalStrings_es.properties | 8 +-
.../catalina/util/LocalStrings_fr.properties | 6 +-
.../catalina/util/LocalStrings_ja.properties | 8 +-
java/org/apache/catalina/util/URLEncoder.java | 101 ++++-
.../apache/catalina/valves/LocalStrings.properties | 8 +-
.../catalina/valves/LocalStrings_es.properties | 6 +-
.../catalina/valves/LocalStrings_fr.properties | 2 +-
.../catalina/valves/LocalStrings_ja.properties | 2 +-
.../apache/catalina/valves/rewrite/Resolver.java | 10 +
.../catalina/valves/rewrite/ResolverImpl.java | 7 +
.../catalina/valves/rewrite/RewriteValve.java | 62 +--
.../catalina/valves/rewrite/Substitution.java | 4 +-
java/org/apache/coyote/AbstractProtocol.java | 4 +-
java/org/apache/coyote/Constants.java | 10 +
java/org/apache/coyote/LocalStrings.properties | 1 +
java/org/apache/coyote/Request.java | 65 ++-
java/org/apache/coyote/Response.java | 70 +++-
java/org/apache/coyote/ajp/LocalStrings.properties | 6 +-
.../apache/coyote/ajp/LocalStrings_es.properties | 4 +-
.../coyote/http11/AbstractHttp11Protocol.java | 14 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 60 +--
.../apache/coyote/http2/LocalStrings.properties | 2 +-
java/org/apache/el/Messages.properties | 24 +-
java/org/apache/el/Messages_es.properties | 30 +-
.../apache/jasper/compiler/EncodingDetector.java | 18 +-
.../jasper/resources/LocalStrings.properties | 368 ++++++++---------
.../jasper/resources/LocalStrings_es.properties | 452 ++++++++++-----------
.../jasper/resources/LocalStrings_fr.properties | 156 +++----
.../jasper/resources/LocalStrings_ja.properties | 310 +++++++-------
java/org/apache/naming/LocalStrings.properties | 8 +-
java/org/apache/naming/LocalStrings_es.properties | 12 +-
java/org/apache/naming/LocalStrings_fr.properties | 6 +-
java/org/apache/naming/LocalStrings_ja.properties | 6 +-
java/org/apache/tomcat/InstanceManager.java | 26 +-
java/org/apache/tomcat/util/buf/B2CConverter.java | 16 +
java/org/apache/tomcat/util/buf/UDecoder.java | 106 +++--
.../tomcat/util/descriptor/web/FilterMap.java | 2 +-
.../util/descriptor/web/JspPropertyGroup.java | 2 +-
.../util/descriptor/web/LocalStrings.properties | 14 +-
.../util/descriptor/web/LocalStrings_es.properties | 6 +-
.../util/descriptor/web/SecurityCollection.java | 24 +-
.../util/descriptor/web/SecurityConstraint.java | 2 +-
.../apache/tomcat/util/descriptor/web/WebXml.java | 10 +-
.../tomcat/util/descriptor/web/WebXmlParser.java | 2 +-
.../util/descriptor/web/XmlEncodingBase.java | 49 ++-
java/org/apache/tomcat/util/digester/Digester.java | 24 +-
.../tomcat/util/digester/DocumentProperties.java | 12 +-
.../util/digester/LocalStrings.properties} | 2 +-
java/org/apache/tomcat/util/http/Parameters.java | 116 ++++--
.../apache/tomcat/util/net/LocalStrings.properties | 12 +-
.../tomcat/util/net/LocalStrings_es.properties | 14 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 8 +
java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 5 +-
.../tomcat/util/net/jsse/LocalStrings.properties | 14 +-
.../util/net/jsse/LocalStrings_es.properties | 4 +-
.../util/net/jsse/LocalStrings_fr.properties | 2 +-
.../util/net/jsse/LocalStrings_ja.properties | 2 +-
.../util/net/openssl/LocalStrings.properties | 14 +-
.../util/threads/res/LocalStrings.properties | 2 +-
.../util/threads/res/LocalStrings_es.properties | 2 +-
.../websocket/AsyncChannelWrapperSecure.java | 2 +
.../websocket/server/LocalStrings.properties | 2 +-
.../tomcat/jdbc/test/TestSlowQueryComparator.java | 3 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
.../netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
res/maven/README.txt | 6 +-
res/maven/mvn-pub.xml | 219 +++++-----
res/maven/mvn.properties.default | 22 +-
res/maven/tomcat-embed-jasper.pom | 4 +-
res/maven/tomcat-jasper.pom | 4 +-
...TestApplicationContextGetRequestDispatcher.java | 8 +-
.../catalina/core/TestApplicationPushBuilder.java | 15 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 3 +-
.../catalina/filters/TestAddCharSetFilter.java | 5 +-
.../apache/coyote/http2/TestHttp2Section_8_1.java | 1 -
test/org/apache/tomcat/util/buf/TestUDecoder.java | 14 +-
.../apache/tomcat/util/http/TestParameters.java | 3 +-
.../util/http/TesterParametersPerformance.java | 2 +-
webapps/docs/changelog.xml | 143 ++++++-
webapps/docs/config/cluster-receiver.xml | 3 +
webapps/docs/security-howto.xml | 4 +-
.../WEB-INF/classes/LocalStrings_es.properties | 46 +--
193 files changed, 3142 insertions(+), 2541 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