[tomcat8] 02/05: Merge tag 'upstream/8.0.21'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Mar 30 18:53:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 704229cbf748cbfab1338cb5d9e4051e0ac70b00
Merge: 4c0c843 67517d2
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Mar 30 17:20:51 2015 +0200
Merge tag 'upstream/8.0.21'
Upstream version 8.0.21
BUILDING.txt | 16 +-
bin/catalina-tasks.xml | 11 +-
build.properties.default | 11 +-
build.xml | 45 +-
conf/catalina.properties | 2 +-
java/javax/el/ImportHandler.java | 53 +-
java/javax/el/LocalStrings.properties | 1 -
java/javax/servlet/http/HttpServlet.java | 12 +-
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/org/apache/catalina/Realm.java | 9 +
java/org/apache/catalina/WebResourceRoot.java | 6 +
java/org/apache/catalina/WebResourceSet.java | 6 +
.../catalina/authenticator/AuthenticatorBase.java | 78 +++
.../catalina/authenticator/BasicAuthenticator.java | 33 +-
.../authenticator/DigestAuthenticator.java | 44 +-
.../catalina/authenticator/FormAuthenticator.java | 35 +-
.../catalina/authenticator/LocalStrings.properties | 5 +
.../authenticator/NonLoginAuthenticator.java | 35 +-
.../catalina/authenticator/SSLAuthenticator.java | 39 +-
.../catalina/authenticator/SingleSignOn.java | 3 +-
.../authenticator/SpnegoAuthenticator.java | 30 +-
.../apache/catalina/connector/CoyoteAdapter.java | 58 ++-
.../catalina/connector/LocalStrings.properties | 2 +
.../apache/catalina/connector/OutputBuffer.java | 2 +-
java/org/apache/catalina/connector/Request.java | 7 +-
.../apache/catalina/core/ApplicationContext.java | 30 +-
.../catalina/core/ApplicationHttpRequest.java | 29 +-
.../apache/catalina/core/AprLifecycleListener.java | 34 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 10 +-
.../core/JreMemoryLeakPreventionListener.java | 2 +-
.../apache/catalina/core/LocalStrings.properties | 3 +
java/org/apache/catalina/core/StandardContext.java | 28 +-
java/org/apache/catalina/core/StandardHost.java | 3 +
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 99 +++-
.../apache/catalina/ha/session/DeltaManager.java | 19 -
.../catalina/ha/session/LocalStrings.properties | 2 -
.../catalina/ha/session/LocalStrings_es.properties | 2 -
.../catalina/loader/WebappClassLoaderBase.java | 2 +-
.../mbeans/JmxRemoteLifecycleListener.java | 225 ++++++---
.../apache/catalina/mbeans/LocalStrings.properties | 1 -
java/org/apache/catalina/realm/CombinedRealm.java | 35 ++
.../realm/DigestCredentialHandlerBase.java | 23 +-
java/org/apache/catalina/realm/JDBCRealm.java | 9 +-
java/org/apache/catalina/realm/JNDIRealm.java | 332 ++++++++++++-
.../apache/catalina/realm/LocalStrings.properties | 7 +
java/org/apache/catalina/realm/RealmBase.java | 21 +
.../catalina/security/SecurityClassLoad.java | 1 -
.../apache/catalina/security/SecurityListener.java | 7 +-
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/servlets/DefaultServlet.java | 24 +-
java/org/apache/catalina/startup/Constants.java | 1 +
.../org/apache/catalina/startup/ContextConfig.java | 7 +-
java/org/apache/catalina/startup/ExpandWar.java | 61 ++-
java/org/apache/catalina/startup/HostConfig.java | 99 ++--
.../catalina/startup/LocalStrings.properties | 1 +
java/org/apache/catalina/startup/Tomcat.java | 35 +-
.../catalina/startup/WebappServiceLoader.java | 19 +-
.../interceptors/DomainFilterInterceptor.java | 8 +-
.../tribes/tipis/AbstractReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 26 +
.../catalina/valves/ExtendedAccessLogValve.java | 23 +-
.../apache/catalina/valves/PersistentValve.java | 4 +-
.../webresources/AbstractArchiveResource.java | 45 +-
.../webresources/AbstractArchiveResourceSet.java | 40 ++
.../webresources/AbstractFileResourceSet.java | 11 +
.../catalina/webresources/AbstractResourceSet.java | 3 +-
.../catalina/webresources/DirResourceSet.java | 2 +-
.../catalina/webresources/EmptyResourceSet.java | 5 +
.../apache/catalina/webresources/JarResource.java | 14 +-
.../catalina/webresources/JarResourceSet.java | 3 +-
.../catalina/webresources/JarWarResource.java | 15 +-
.../catalina/webresources/JarWarResourceSet.java | 3 +-
.../apache/catalina/webresources/StandardRoot.java | 12 +
java/org/apache/coyote/AbstractProtocol.java | 13 +-
java/org/apache/coyote/ActionCode.java | 8 +-
java/org/apache/coyote/AsyncStateMachine.java | 16 +-
java/org/apache/coyote/Request.java | 20 +-
java/org/apache/coyote/Response.java | 15 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 33 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 14 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 3 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 +-
java/org/apache/coyote/ajp/AjpNio2Processor.java | 11 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 7 +-
java/org/apache/coyote/ajp/Constants.java | 1 +
.../coyote/http11/AbstractHttp11Processor.java | 31 +-
.../coyote/http11/AbstractHttp11Protocol.java | 63 +++
.../apache/coyote/http11/AbstractInputBuffer.java | 17 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 4 +-
.../apache/coyote/http11/Http11AprProcessor.java | 15 +-
.../apache/coyote/http11/Http11AprProtocol.java | 14 +-
.../apache/coyote/http11/Http11Nio2Processor.java | 7 +-
.../apache/coyote/http11/Http11Nio2Protocol.java | 4 +-
.../apache/coyote/http11/Http11NioProcessor.java | 12 +-
.../apache/coyote/http11/Http11NioProtocol.java | 4 +-
java/org/apache/coyote/http11/Http11Processor.java | 12 +-
java/org/apache/coyote/http11/Http11Protocol.java | 4 +-
.../coyote/http11/InternalAprOutputBuffer.java | 3 +-
.../coyote/http11/filters/BufferedInputFilter.java | 2 +
.../coyote/http11/filters/ChunkedInputFilter.java | 29 +-
.../coyote/http11/filters/IdentityInputFilter.java | 18 +-
.../http11/upgrade/AbstractServletInputStream.java | 21 +-
.../upgrade/AbstractServletOutputStream.java | 26 +-
.../http11/upgrade/AprServletOutputStream.java | 2 +-
.../coyote/http11/upgrade/LocalStrings.properties | 4 +
java/org/apache/jasper/JspC.java | 24 +-
java/org/apache/jasper/JspCompilationContext.java | 12 +-
java/org/apache/jasper/compiler/Compiler.java | 4 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 2 +-
.../apache/jasper/compiler/TagFileProcessor.java | 4 +
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 5 +-
.../jasper/runtime/ProtectedFunctionMapper.java | 103 +---
.../apache/jasper/security/SecurityClassLoad.java | 8 -
.../apache/jasper/servlet/JspCServletContext.java | 12 +-
.../apache/jasper/servlet/JspServletWrapper.java | 2 +-
java/org/apache/jasper/servlet/TldScanner.java | 23 +-
java/org/apache/naming/factory/BeanFactory.java | 69 ++-
java/org/apache/tomcat/jni/Library.java | 40 +-
.../apache/tomcat/jni/LibraryNotFoundError.java | 35 +-
java/org/apache/tomcat/jni/SSL.java | 4 +-
.../apache/tomcat/util/descriptor/web/WebXml.java | 2 +-
.../http/fileupload/util/mime/MimeUtility.java | 2 +-
.../modules/MbeansDescriptorsDigesterSource.java | 12 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 72 +++
java/org/apache/tomcat/util/net/AprEndpoint.java | 237 +++++----
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 28 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 62 +--
java/org/apache/tomcat/util/net/SSLSupport.java | 44 +-
java/org/apache/tomcat/util/net/SocketWrapper.java | 37 +-
.../tomcat/util/net/jsse/JSSEImplementation.java | 7 +
.../tomcat/util/net/jsse/JSSESocketFactory.java | 95 +++-
.../apache/tomcat/util/net/jsse/JSSESupport.java | 57 ++-
.../tomcat/util/net/jsse/openssl/Cipher.java | 283 ++++++++++-
.../tomcat/util/net/jsse/openssl/KeyExchange.java | 24 +-
.../openssl/OpenSSLCipherConfigurationParser.java | 30 +-
.../util/net/jsse/res/LocalStrings.properties | 2 +
.../tomcat/util/net/res/LocalStrings.properties | 2 +
.../tomcat/util/scan/JarFileUrlNestedJar.java | 2 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 47 +-
.../tomcat/websocket/LocalStrings.properties | 4 +-
.../apache/tomcat/websocket/PerMessageDeflate.java | 54 +-
java/org/apache/tomcat/websocket/WsSession.java | 9 +-
.../tomcat/websocket/WsWebSocketContainer.java | 3 +-
.../websocket/server/LocalStrings.properties | 2 +-
.../tomcat/websocket/server/WsServerContainer.java | 8 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
modules/jdbc-pool/doc/package.xsl | 2 +-
.../tomcat/jdbc/test/TestSizePreservation.java | 2 +-
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 +-
test/javax/el/TestArrayELResolver.java | 2 +-
test/javax/el/TestImportHandler.java | 28 +-
test/javax/servlet/http/TestHttpServlet.java | 73 +++
test/javax/servlet/jsp/TesterPageContext.java | 195 ++++++++
.../TestScopedAttributeELResolverPerformance.java} | 34 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 2 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 2 +-
.../TesterDigestAuthenticatorPerformance.java | 5 +
.../catalina/connector/TestOutputBuffer.java | 2 +-
.../org/apache/catalina/connector/TestRequest.java | 6 +-
.../connector/TestResponsePerformance.java | 51 +-
.../catalina/core/TestApplicationContext.java | 11 +-
.../catalina/core/TestApplicationFilterChain.java | 110 -----
.../apache/catalina/core/TestAsyncContextImpl.java | 104 +++-
.../apache/catalina/core/TestStandardContext.java | 49 ++
.../catalina/core/TestStandardContextAliases.java | 8 +-
.../apache/catalina/filters/TestCorsFilter.java | 131 ++++-
.../catalina/filters/TesterHttpServletRequest.java | 20 +-
.../catalina/ha/context/TestReplicatedContext.java | 2 +-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 10 +-
test/org/apache/catalina/mapper/TestMapper.java | 36 +-
.../catalina/mapper/TestMapperPerformance.java | 61 +++
.../catalina/servlets/TestDefaultServlet.java | 37 +-
.../catalina/servlets/TestWebdavServlet.java | 2 +-
.../catalina/session/TestPersistentManager.java | 88 +++-
.../apache/catalina/startup/SimpleHttpClient.java | 4 +
test/org/apache/catalina/startup/TestTomcat.java | 2 +-
.../catalina/startup/TestWebappServiceLoader.java | 60 ++-
.../apache/catalina/startup/TomcatBaseTest.java | 17 +-
.../valves/TestExtendedAccessLogValve.java | 63 +++
.../catalina/valves/TesterAccessLogValve.java | 13 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 20 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 128 ++++-
.../coyote/http11/TestAbstractHttp11Processor.java | 102 +++-
.../coyote/http11/TestInternalInputBuffer.java | 4 +-
.../http11/filters/TestChunkedInputFilter.java | 3 +
test/org/apache/el/TestELInJsp.java | 4 +-
.../apache/jasper/TestJspCompilationContext.java | 32 ++
test/org/apache/jasper/compiler/TestNode.java | 2 +-
test/org/apache/jasper/servlet/TestTldScanner.java | 29 ++
test/org/apache/tomcat/unittest/TesterCounter.java | 11 +
.../tomcat/unittest/TesterLeakingServlet1.java | 8 +-
.../tomcat/unittest/TesterLeakingServlet2.java | 6 +
.../apache/tomcat/util/buf/TestB2CConverter.java | 3 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 3 +-
.../tomcat/util/net/jsse/openssl/TestCipher.java | 43 +-
.../TestOpenSSLCipherConfigurationParser.java | 5 +-
.../TestOpenSSLCipherConfigurationParserOnly.java | 69 +++
.../util/net/jsse/openssl/TesterOpenSSL.java | 57 ++-
test/org/apache/tomcat/util/net/localhost-cert.pem | 62 +--
.../org/apache/tomcat/util/net/localhost-copy1.jks | Bin 2197 -> 2197 bytes
test/org/apache/tomcat/util/net/localhost.jks | Bin 2197 -> 2197 bytes
test/org/apache/tomcat/util/net/user1.jks | Bin 2194 -> 2194 bytes
.../tomcat/websocket/TestWsWebSocketContainer.java | 2 +-
.../a/Foo.java} | 28 +-
.../b/Foo.java} | 28 +-
test/webapp/WEB-INF/web.xml | 19 +
test/webapp/bug5nnnn/bug57601.jsp | 18 +
test/webapp/bug5nnnn/bug57601.txt | 16 +
webapps/docs/changelog.xml | 547 ++++++++++++++++++++-
webapps/docs/class-loader-howto.xml | 6 +-
webapps/docs/config/ajp.xml | 20 +-
webapps/docs/config/automatic-deployment.xml | 12 +-
webapps/docs/config/context.xml | 6 +-
webapps/docs/config/host.xml | 9 +-
webapps/docs/config/http.xml | 35 +-
webapps/docs/config/jar-scan-filter.xml | 2 +-
webapps/docs/config/listeners.xml | 5 +-
webapps/docs/config/realm.xml | 35 ++
webapps/docs/config/systemprops.xml | 2 +-
webapps/docs/config/valve.xml | 16 +-
webapps/docs/jasper-howto.xml | 2 +-
webapps/docs/jndi-datasource-examples-howto.xml | 21 +-
webapps/docs/jndi-resources-howto.xml | 97 ++++
webapps/docs/logging.xml | 2 +-
webapps/docs/realm-howto.xml | 13 +-
webapps/docs/security-howto.xml | 10 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 +-
webapps/docs/windows-auth-howto.xml | 6 +-
.../WEB-INF/classes/async/AsyncStockServlet.java | 6 +-
.../compressionFilters/CompressionFilter.java | 4 +-
.../WEB-INF/classes/examples/ShowSource.java | 38 +-
webapps/examples/jsp/jsp2/el/composite.jsp | 2 +-
webapps/examples/jsp/jsp2/jspx/svgexample.html | 16 +-
240 files changed, 5038 insertions(+), 1691 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