[tomcat8] 01/05: Merge tag 'upstream/8.5.10'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jan 17 14:11:57 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 513db5bee068a566ce2a9cf3d015bd74750bc28a
Merge: 07ebfd5 31cbdec
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 6 11:02:24 2017 +0100
Merge tag 'upstream/8.5.10'
Upstream version 8.5.10
BUILDING.txt | 12 +
NOTICE | 2 +-
build.properties.default | 6 +-
build.xml | 12 +-
.../apache/catalina/loader/LocalStrings.properties | 3 +-
.../catalina/loader/WebappClassLoaderBase.java | 73 ++-
java/org/apache/catalina/manager/Constants.java | 12 +-
.../catalina/manager/HTMLManagerServlet.java | 2 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../realm/DigestCredentialHandlerBase.java | 52 +-
.../apache/catalina/realm/LocalStrings.properties | 1 +
.../realm/MessageDigestCredentialHandler.java | 5 +
.../catalina/realm/SecretKeyCredentialHandler.java | 11 +-
.../apache/catalina/valves/LocalStrings.properties | 3 +-
.../catalina/valves/rewrite/ResolverImpl.java | 1 -
.../apache/coyote/http11/Http11InputBuffer.java | 14 +-
.../coyote/http2/ConnectionSettingsBase.java | 2 +-
java/org/apache/coyote/http2/HPackHuffman.java | 8 +-
java/org/apache/coyote/http2/Hpack.java | 8 +-
java/org/apache/coyote/http2/HpackEncoder.java | 13 +-
.../apache/coyote/http2/Http2UpgradeHandler.java | 4 +-
.../apache/coyote/http2/LocalStrings.properties | 1 +
java/org/apache/coyote/http2/Stream.java | 5 +-
.../apache/jasper/compiler/EncodingDetector.java | 205 +++++++
java/org/apache/jasper/compiler/Generator.java | 42 +-
.../apache/jasper/compiler/ParserController.java | 19 +-
.../apache/jasper/security/SecurityClassLoad.java | 4 +
java/org/apache/jasper/xmlparser/ASCIIReader.java | 3 +
java/org/apache/jasper/xmlparser/EncodingMap.java | 3 +
java/org/apache/jasper/xmlparser/SymbolTable.java | 3 +
java/org/apache/jasper/xmlparser/UCSReader.java | 3 +
java/org/apache/jasper/xmlparser/UTF8Reader.java | 3 +
java/org/apache/jasper/xmlparser/XMLChar.java | 3 +
.../jasper/xmlparser/XMLEncodingDetector.java | 4 +
java/org/apache/jasper/xmlparser/XMLString.java | 3 +
.../apache/jasper/xmlparser/XMLStringBuffer.java | 3 +
.../datasources/InstanceKeyDataSourceFactory.java | 1 -
java/org/apache/tomcat/util/compat/Jre9Compat.java | 6 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 4 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 67 ++-
java/org/apache/tomcat/util/net/AprEndpoint.java | 38 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 38 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 65 +--
java/org/apache/tomcat/util/net/SSLHostConfig.java | 21 +-
.../tomcat/util/net/openssl/OpenSSLContext.java | 34 ++
.../server/WsRemoteEndpointImplServer.java | 4 +-
modules/jdbc-pool/NOTICE | 2 +-
modules/jdbc-pool/build.xml | 4 +-
res/header.bmp | Bin 9742 -> 10198 bytes
res/maven/mvn.properties.default | 2 +-
res/side_left.bmp | Bin 345238 -> 345238 bytes
.../apache/catalina/filters/TestExpiresFilter.java | 1 -
.../TestWebappClassLoaderExecutorMemoryLeak.java | 1 -
.../realm/TestMessageDigestCredentialHandler.java | 4 +-
.../realm/TestSecretKeyCredentialHandler.java | 57 +-
test/org/apache/coyote/http2/Http2TestBase.java | 2 +-
test/org/apache/coyote/http2/TestHpack.java | 39 +-
.../apache/coyote/http2/TestStreamQueryString.java | 140 +++++
.../jasper/compiler/TestEncodingDetector.java | 93 +++
.../apache/jasper/runtime/TestPageContextImpl.java | 1 -
.../apache/tomcat/websocket/server/TestClose.java | 1 -
test/webapp/jsp/encoding/README.txt | 40 ++
test/webapp/jsp/encoding/bom-none-prolog-none.jsp | 17 +
test/webapp/jsp/encoding/bom-none-prolog-none.jspx | 21 +
.../jsp/encoding/bom-none-prolog-utf16be.jspx | Bin 0 -> 2010 bytes
.../jsp/encoding/bom-none-prolog-utf16le.jspx | Bin 0 -> 2010 bytes
test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx | 21 +
.../jsp/encoding/bom-utf16be-prolog-none.jsp | Bin 0 -> 1764 bytes
.../jsp/encoding/bom-utf16be-prolog-none.jspx | Bin 0 -> 1970 bytes
.../jsp/encoding/bom-utf16be-prolog-utf16be.jspx | Bin 0 -> 2010 bytes
.../jsp/encoding/bom-utf16be-prolog-utf16le.jspx | Bin 0 -> 2010 bytes
.../jsp/encoding/bom-utf16be-prolog-utf8.jspx | Bin 0 -> 2004 bytes
.../jsp/encoding/bom-utf16le-prolog-none.jsp | Bin 0 -> 1764 bytes
.../jsp/encoding/bom-utf16le-prolog-none.jspx | Bin 0 -> 1970 bytes
.../jsp/encoding/bom-utf16le-prolog-utf16be.jspx | Bin 0 -> 2010 bytes
.../jsp/encoding/bom-utf16le-prolog-utf16le.jspx | Bin 0 -> 2010 bytes
.../jsp/encoding/bom-utf16le-prolog-utf8.jspx | Bin 0 -> 2004 bytes
test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp | 17 +
test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx | 21 +
.../jsp/encoding/bom-utf8-prolog-utf16be.jspx | 21 +
.../jsp/encoding/bom-utf8-prolog-utf16le.jspx | 21 +
test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx | 21 +
webapps/ROOT/asf-logo-wide.gif | Bin 5866 -> 0 bytes
webapps/ROOT/asf-logo-wide.svg | 279 +++++++++
webapps/ROOT/asf-logo.png | Bin 17811 -> 0 bytes
webapps/ROOT/build.xml | 93 ---
webapps/ROOT/tomcat.css | 2 +-
webapps/ROOT/tomcat.svg | 646 ++++++++++++++++-----
webapps/docs/appdev/sample/web/images/tomcat.gif | Bin 1441 -> 2066 bytes
webapps/docs/changelog.xml | 128 +++-
webapps/docs/cluster-howto.xml | 16 +
webapps/docs/config/cluster.xml | 15 +
webapps/docs/config/context.xml | 10 +-
webapps/docs/config/http.xml | 7 +-
webapps/docs/config/jar-scan-filter.xml | 4 +-
webapps/docs/images/asf-feather.png | Bin 40042 -> 0 bytes
webapps/docs/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/docs/images/asf-logo.svg | 210 +++++++
webapps/docs/images/tomcat.png | Bin 8410 -> 5103 bytes
webapps/docs/monitoring.xml | 2 +-
webapps/docs/security-howto.xml | 36 ++
webapps/docs/tomcat-docs.xsl | 4 +-
webapps/host-manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/host-manager/images/asf-logo.svg | 210 +++++++
webapps/host-manager/images/tomcat.gif | Bin 1934 -> 2066 bytes
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
webapps/manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/manager/images/asf-logo.svg | 210 +++++++
110 files changed, 2780 insertions(+), 473 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