This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit c2eb79354d4fadb48ffca9b6e4a1e65ad53839dd Merge: 57954cb 2fab360 Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 21 00:52:34 2017 +0200 Merge tag 'upstream/8.5.14' Upstream version 8.5.14 build.properties.default | 4 +- build.xml | 4 + java/javax/el/BeanELResolver.java | 1 + java/org/apache/catalina/Pipeline.java | 11 ++ .../apache/catalina/connector/CoyoteAdapter.java | 38 ++++--- .../org/apache/catalina/connector/InputBuffer.java | 9 +- .../catalina/connector/LocalStrings.properties | 4 +- java/org/apache/catalina/connector/Request.java | 35 ++++++- .../apache/catalina/connector/RequestFacade.java | 4 +- .../catalina/core/ApplicationContextFacade.java | 2 +- .../catalina/core/ApplicationFilterChain.java | 21 +++- .../catalina/core/ApplicationHttpRequest.java | 2 +- .../apache/catalina/core/LocalStrings.properties | 8 +- .../catalina/core/LocalStrings_es.properties | 4 +- .../catalina/core/LocalStrings_fr.properties | 2 +- .../org/apache/catalina/core/StandardPipeline.java | 14 ++- .../catalina/ha/deploy/LocalStrings.properties | 4 +- .../catalina/ha/session/LocalStrings.properties | 4 +- .../apache/catalina/ha/tcp/LocalStrings.properties | 2 +- .../catalina/ha/tcp/LocalStrings_es.properties | 3 +- .../apache/catalina/realm/LocalStrings.properties | 2 +- .../servlet4preview/http/HttpServletRequest.java | 2 +- .../http/HttpServletRequestWrapper.java | 6 +- java/org/apache/catalina/startup/Catalina.java | 1 + .../catalina/startup/LocalStrings.properties | 2 +- .../catalina/startup/LocalStrings_es.properties | 2 +- java/org/apache/catalina/startup/Tomcat.java | 3 +- .../group/interceptors/LocalStrings.properties | 2 +- .../apache/catalina/util/ExtensionValidator.java | 5 +- .../catalina/webresources/JarWarResourceSet.java | 17 ++++ .../catalina/webresources/LocalStrings.properties | 2 +- java/org/apache/coyote/Constants.java | 4 +- java/org/apache/coyote/Response.java | 9 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 49 +++++---- java/org/apache/el/Messages.properties | 2 +- java/org/apache/el/Messages_es.properties | 2 +- .../jasper/resources/LocalStrings.properties | 42 ++++---- .../jasper/resources/LocalStrings_es.properties | 40 ++++---- .../jasper/resources/LocalStrings_fr.properties | 6 +- .../jasper/resources/LocalStrings_ja.properties | 28 +++--- java/org/apache/tomcat/buildutil/SignCode.java | 31 +++++- java/org/apache/tomcat/util/ExceptionUtils.java | 11 ++ java/org/apache/tomcat/util/buf/StringUtils.java | 5 + .../apache/tomcat/util/codec/BinaryDecoder.java | 3 + .../apache/tomcat/util/codec/BinaryEncoder.java | 3 + java/org/apache/tomcat/util/codec/Decoder.java | 3 + .../apache/tomcat/util/codec/DecoderException.java | 3 + java/org/apache/tomcat/util/codec/Encoder.java | 3 + .../apache/tomcat/util/codec/EncoderException.java | 3 + .../tomcat/util/codec/binary/BaseNCodec.java | 5 + java/org/apache/tomcat/util/compat/Jre8Compat.java | 3 +- .../util/descriptor/web/LocalStrings.properties | 2 +- .../tomcat/util/http/LocalStrings.properties | 2 +- .../apache/tomcat/util/modeler/ManagedBean.java | 2 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 2 +- .../tomcat/util/net/openssl/ciphers/Cipher.java | 40 ++++---- .../apache/tomcat/jdbc/pool/StatementFacade.java | 28 +----- .../AbstractCreateStatementInterceptor.java | 28 ++++++ .../jdbc/pool/interceptor/AbstractQueryReport.java | 23 ----- .../interceptor/StatementDecoratorInterceptor.java | 24 ----- res/maven/mvn.properties.default | 2 +- .../webresources/TestJarWarResourceSet.java | 56 +++++++++++ test/org/apache/coyote/http2/Http2TestBase.java | 30 +++++- .../coyote/http2/TestHttp2UpgradeHandler.java | 71 +++++++++++++ .../util/net/openssl/ciphers/TestCipher.java | 6 +- .../TestOpenSSLCipherConfigurationParser.java | 6 +- .../util/net/openssl/ciphers/TesterOpenSSL.java | 42 +++++++- webapps/docs/changelog.xml | 111 ++++++++++++++++++++- webapps/docs/config/systemprops.xml | 4 +- .../WEB-INF/classes/http2/SimpleImagePush.java | 2 +- 70 files changed, 705 insertions(+), 251 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
