[tomcat8] 01/03: Merge tag 'upstream/8.5.12'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Apr 18 12:53:36 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 33a30a6eb30cde6d719c534c8efa3f7b9da07049
Merge: 6ad4be0 bd367d0
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Apr 18 09:50:13 2017 +0200
Merge tag 'upstream/8.5.12'
Upstream version 8.5.12
build.properties.default | 18 +-
build.xml | 1 +
conf/catalina.properties | 4 +
java/javax/servlet/http/HttpServlet.java | 13 +
java/org/apache/catalina/Context.java | 28 +
.../catalina/authenticator/AuthenticatorBase.java | 56 +-
.../catalina/authenticator/FormAuthenticator.java | 11 +-
.../authenticator/SpnegoAuthenticator.java | 15 +-
.../jaspic/AuthConfigFactoryImpl.java | 279 ++++-
.../authenticator/jaspic/LocalStrings.properties | 2 +
.../apache/catalina/connector/CoyoteAdapter.java | 68 +-
java/org/apache/catalina/connector/Request.java | 75 +-
.../apache/catalina/connector/RequestFacade.java | 18 +-
java/org/apache/catalina/connector/Response.java | 12 +-
.../apache/catalina/core/ApplicationContext.java | 113 +-
.../catalina/core/ApplicationContextFacade.java | 74 +-
.../catalina/core/ApplicationDispatcher.java | 40 +-
.../catalina/core/ApplicationHttpRequest.java | 12 +-
.../apache/catalina/core/ApplicationMapping.java | 16 +-
.../catalina/core/ApplicationPushBuilder.java | 48 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 5 +
.../catalina/core/DefaultInstanceManager.java | 35 +-
.../apache/catalina/core/LocalStrings.properties | 7 +
java/org/apache/catalina/core/StandardContext.java | 81 +-
.../apache/catalina/core/StandardHostValve.java | 6 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
.../ha/authenticator/ClusterSingleSignOn.java | 9 +
.../ha/authenticator/mbeans-descriptors.xml | 4 +
.../catalina/ha/context/ReplicatedContext.java | 5 +-
.../apache/catalina/ha/session/BackupManager.java | 15 +
.../catalina/ha/session/mbeans-descriptors.xml | 4 +
java/org/apache/catalina/realm/RealmBase.java | 53 +-
.../catalina/security/SecurityClassLoad.java | 3 +-
.../AsyncContext.java} | 27 +-
.../catalina/servlet4preview/ServletContext.java | 153 +++
.../servlet4preview/http/HttpServletRequest.java | 17 +-
.../http/HttpServletRequestWrapper.java | 20 +-
.../catalina/servlet4preview/http/PushBuilder.java | 27 +-
.../http/{Mapping.java => ServletMapping.java} | 2 +-
.../apache/catalina/servlets/DefaultServlet.java | 10 +-
.../apache/catalina/servlets/WebdavServlet.java | 8 +-
.../org/apache/catalina/startup/FailedContext.java | 10 +
java/org/apache/catalina/startup/Tomcat.java | 2 +-
.../storeconfig/ConnectorStoreAppender.java | 6 +-
.../apache/catalina/tribes/group/RpcChannel.java | 3 +-
.../tribes/tipis/AbstractReplicatedMap.java | 11 +-
.../catalina/tribes/tipis/LocalStrings.properties | 1 +
java/org/apache/catalina/util/ParameterMap.java | 187 +--
.../apache/catalina/valves/ErrorReportValve.java | 84 +-
.../apache/catalina/valves/LocalStrings.properties | 157 ++-
.../catalina/valves/LocalStrings_es.properties | 77 +-
.../catalina/valves/LocalStrings_fr.properties | 75 +-
.../catalina/valves/LocalStrings_ja.properties | 3 +-
.../catalina/webresources/JarWarResource.java | 6 +-
.../apache/catalina/webresources/StandardRoot.java | 3 +-
.../apache/catalina/webresources/WarResource.java | 4 +-
java/org/apache/coyote/AbstractProcessor.java | 20 +-
java/org/apache/coyote/AsyncStateMachine.java | 21 +-
java/org/apache/coyote/InputBuffer.java | 1 +
java/org/apache/coyote/OutputBuffer.java | 1 +
java/org/apache/coyote/PushToken.java | 44 -
java/org/apache/coyote/Request.java | 3 +-
java/org/apache/coyote/Response.java | 5 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +
.../coyote/http11/AbstractHttp11JsseProtocol.java | 2 +-
.../apache/coyote/http11/Http11InputBuffer.java | 2 +
.../apache/coyote/http11/Http11Nio2Protocol.java | 2 +-
.../apache/coyote/http11/Http11NioProtocol.java | 2 +-
.../apache/coyote/http11/Http11OutputBuffer.java | 2 +
.../coyote/http11/filters/BufferedInputFilter.java | 1 +
.../coyote/http11/filters/ChunkedOutputFilter.java | 1 +
.../coyote/http11/filters/GzipOutputFilter.java | 1 +
.../coyote/http11/filters/IdentityInputFilter.java | 1 +
.../http11/filters/IdentityOutputFilter.java | 1 +
.../http11/filters/SavedRequestInputFilter.java | 1 +
.../coyote/http11/filters/VoidInputFilter.java | 1 +
.../coyote/http11/filters/VoidOutputFilter.java | 1 +
java/org/apache/coyote/http2/Http2Parser.java | 5 +
.../apache/coyote/http2/Http2UpgradeHandler.java | 2 +-
.../apache/coyote/http2/LocalStrings.properties | 2 +-
java/org/apache/coyote/http2/Stream.java | 18 +-
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
.../apache/jasper/compiler/EncodingDetector.java | 30 +-
java/org/apache/jasper/compiler/Generator.java | 66 +-
.../apache/jasper/compiler/ParserController.java | 4 +-
.../jasper/runtime/JspApplicationContextImpl.java | 11 +-
.../apache/jasper/runtime/JspContextWrapper.java | 7 +
.../apache/jasper/runtime/JspRuntimeLibrary.java | 44 +
java/org/apache/jasper/runtime/TagHandlerPool.java | 27 +-
java/org/apache/tomcat/util/bcel/Const.java | 15 +-
.../tomcat/util/bcel/classfile/Constant.java | 2 +
java/org/apache/tomcat/util/buf/UriUtil.java | 54 +-
.../tomcat/util/http/CookieProcessorBase.java | 45 +
.../tomcat/util/http/LegacyCookieProcessor.java | 22 +-
.../tomcat/util/http/Rfc6265CookieProcessor.java | 26 +-
.../org/apache/tomcat/util/http/parser/Cookie.java | 11 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 26 +-
.../util/http/parser/LocalStrings.properties | 3 +-
.../tomcat/util/net/AbstractJsseEndpoint.java | 7 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +
.../apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 19 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 12 +
.../apache/tomcat/util/net/SecureNio2Channel.java | 6 +-
java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 14 +-
.../tomcat/util/scan/AbstractInputStreamJar.java | 4 +
java/org/apache/tomcat/util/scan/JarFactory.java | 4 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 4 +
java/org/apache/tomcat/websocket/WsFrameBase.java | 79 +-
.../org/apache/tomcat/websocket/WsFrameClient.java | 20 +-
java/org/apache/tomcat/websocket/WsSession.java | 125 +-
.../tomcat/websocket/WsWebSocketContainer.java | 36 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
.../netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
res/tomcat.nsi | 4 +-
.../jaspic/TestAuthConfigFactoryImpl.java | 294 +++++
.../apache/catalina/connector/TestConnector.java | 81 ++
.../catalina/connector/TestKeepAliveCount.java | 2 +-
.../catalina/core/TestApplicationMapping.java | 84 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 18 +-
.../catalina/core/TestDefaultInstanceManager.java | 75 ++
.../apache/catalina/startup/SimpleHttpClient.java | 22 +-
.../org/apache/catalina/util/TestParameterMap.java | 254 ++++
.../catalina/valves/TestErrorReportValve.java | 4 +-
test/org/apache/coyote/http2/Http2TestBase.java | 4 +-
.../org/apache/coyote/http2/TestAbortedUpload.java | 131 ++
.../jasper/compiler/TestEncodingDetector.java | 2 +
.../jasper/runtime/TestJspContextWrapper.java | 16 +
.../jasper/servlet/TestJspCServletContext.java | 2 +-
test/org/apache/tomcat/unittest/TesterContext.java | 10 +
.../org/apache/tomcat/util/buf/TestUriUtil24.java | 27 +-
.../org/apache/tomcat/util/buf/TestUriUtil26.java | 27 +-
.../org/apache/tomcat/util/buf/TestUriUtil2A.java | 27 +-
.../org/apache/tomcat/util/buf/TestUriUtil40.java | 27 +-
.../{TestUriUtil.java => TesterUriUtilBase.java} | 51 +-
.../apache/tomcat/util/http/TestCookieParsing.java | 13 +
.../util/http/TestCookieProcessorGeneration.java | 11 +-
test/org/apache/tomcat/util/http/TestCookies.java | 31 +-
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
.../util/net/openssl/ciphers/TestCipher.java | 1301 ++++++++++----------
test/org/apache/tomcat/util/net/user1.jks | Bin 2194 -> 2193 bytes
.../util/scan/TestAbstractInputStreamJar.java | 59 +
test/webapp/WEB-INF/web.xml | 10 +
test/webapp/bug5nnnn/bug58178c.jsp | 65 +
test/webapp/jsp/encoding/README.txt | 2 +-
test/webapp/jsp/encoding/bug60769a.jspx | 21 +
test/webapp/jsp/encoding/bug60769b.jspx | 21 +
webapps/docs/changelog.xml | 283 ++++-
webapps/docs/config/cluster-manager.xml | 5 +
webapps/docs/config/cluster-valve.xml | 5 +
webapps/docs/config/http.xml | 10 +
webapps/docs/config/systemprops.xml | 17 +
webapps/docs/index.xml | 6 +
160 files changed, 4255 insertions(+), 1855 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