This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 410f6ae09cce551af653e25206937f108c10f0e0 Merge: 56063a2 fe281df Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 19 11:13:52 2015 +0200 Merge tag 'upstream/8.0.28' Upstream version 8.0.28 bin/catalina.sh | 10 +- build.properties.default | 2 +- build.xml | 15 +- java/org/apache/catalina/Context.java | 3 + java/org/apache/catalina/Globals.java | 33 +- .../catalina/authenticator/LocalStrings.properties | 2 +- .../authenticator/SpnegoAuthenticator.java | 4 +- .../org/apache/catalina/connector/InputBuffer.java | 4 +- .../catalina/connector/LocalStrings.properties | 3 + .../apache/catalina/connector/OutputBuffer.java | 8 +- java/org/apache/catalina/connector/Request.java | 7 +- .../catalina/core/ApplicationDispatcher.java | 5 +- .../catalina/core/ApplicationFilterFactory.java | 30 +- .../org/apache/catalina/core/AsyncContextImpl.java | 2 +- .../core/JreMemoryLeakPreventionListener.java | 6 +- .../apache/catalina/core/LocalStrings.properties | 4 + java/org/apache/catalina/core/StandardContext.java | 44 ++- java/org/apache/catalina/core/StandardService.java | 2 +- .../apache/catalina/core/StandardWrapperValve.java | 4 +- .../org/apache/catalina/filters/ExpiresFilter.java | 416 +++++++++++---------- .../catalina/filters/LocalStrings.properties | 6 +- java/org/apache/catalina/ha/ClusterRuleSet.java | 15 + .../apache/catalina/ha/session/DeltaRequest.java | 1 - .../apache/catalina/ha/session/DeltaSession.java | 18 +- .../catalina/ha/session/JvmRouteBinderValve.java | 2 +- .../catalina/ha/session/LocalStrings.properties | 12 +- .../catalina/ha/session/LocalStrings_es.properties | 6 - .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +- .../catalina/loader/WebappClassLoaderBase.java | 3 +- java/org/apache/catalina/mapper/Mapper.java | 4 +- .../org/apache/catalina/realm/DataSourceRealm.java | 8 + .../apache/catalina/realm/JAASCallbackHandler.java | 2 +- java/org/apache/catalina/realm/JDBCRealm.java | 7 + java/org/apache/catalina/realm/MemoryRealm.java | 50 +-- java/org/apache/catalina/realm/RealmBase.java | 3 + .../catalina/session/LocalStrings.properties | 5 +- .../apache/catalina/session/StandardSession.java | 41 +- java/org/apache/catalina/startup/HostConfig.java | 40 +- .../catalina/startup/LocalStrings.properties | 2 + java/org/apache/catalina/startup/Tomcat.java | 14 +- .../apache/catalina/storeconfig/StoreLoader.java | 31 +- .../interceptors/DomainFilterInterceptor.java | 2 +- .../group/interceptors/NonBlockingCoordinator.java | 6 +- .../apache/catalina/tribes/io/ObjectReader.java | 8 +- .../catalina/tribes/membership/McastService.java | 17 +- .../tribes/membership/McastServiceImpl.java | 2 - .../catalina/tribes/membership/MemberImpl.java | 124 +++--- .../catalina/tribes/membership/Membership.java | 224 ++++++----- .../catalina/tribes/tipis/LocalStrings.properties | 8 +- .../catalina/tribes/transport/AbstractSender.java | 2 +- .../catalina/tribes/transport/SenderState.java | 33 +- .../catalina/tribes/transport/nio/NioReceiver.java | 44 ++- .../tribes/transport/nio/PooledParallelSender.java | 23 +- .../apache/catalina/users/MemoryUserDatabase.java | 57 ++- .../org/apache/catalina/util/LifecycleSupport.java | 64 +--- .../apache/catalina/valves/JDBCAccessLogValve.java | 2 +- .../apache/catalina/valves/LocalStrings.properties | 2 + .../webresources/ClasspathURLStreamHandler.java | 50 +++ .../catalina/webresources/JarWarResource.java | 2 +- .../catalina/webresources/LocalStrings.properties | 2 + .../TomcatURLStreamHandlerFactory.java | 3 + java/org/apache/coyote/AbstractProcessor.java | 3 +- java/org/apache/coyote/Request.java | 18 +- java/org/apache/coyote/Response.java | 12 +- .../coyote/http11/AbstractHttp11Processor.java | 10 +- .../apache/coyote/http11/Http11Nio2Processor.java | 11 +- .../coyote/http11/InternalAprInputBuffer.java | 9 + .../apache/coyote/http11/LocalStrings.properties | 2 + .../upgrade/AbstractServletOutputStream.java | 2 +- java/org/apache/el/ValueExpressionLiteral.java | 6 +- java/org/apache/el/parser/ELParser.jjt | 2 +- .../org/apache/el/parser/ELParserTokenManager.java | 4 +- .../apache/jasper/compiler/AttributeParser.java | 14 +- java/org/apache/jasper/compiler/ELParser.java | 9 +- java/org/apache/jasper/compiler/Generator.java | 121 ++++-- .../apache/jasper/compiler/JavacErrorDetail.java | 23 +- .../apache/jasper/compiler/JspDocumentParser.java | 6 +- java/org/apache/jasper/compiler/JspReader.java | 12 +- java/org/apache/jasper/compiler/Parser.java | 34 +- .../jasper/resources/LocalStrings.properties | 4 +- .../org/apache/jasper/util/FastRemovalDequeue.java | 24 +- java/org/apache/juli/AsyncFileHandler.java | 5 +- java/org/apache/juli/ClassLoaderLogManager.java | 12 +- java/org/apache/tomcat/util/buf/UDecoder.java | 2 +- java/org/apache/tomcat/util/compat/JreVendor.java | 49 +++ .../util/descriptor/tld/ImplicitTldRuleSet.java | 29 ++ .../util/descriptor/tld/LocalStrings.properties | 16 + .../tomcat/util/descriptor/tld/TldRuleSet.java | 2 + .../apache/tomcat/util/file/ConfigFileLoader.java | 76 ++++ java/org/apache/tomcat/util/http/HttpMessages.java | 57 +-- java/org/apache/tomcat/util/http/RequestUtil.java | 20 +- .../tomcat/util/http/Rfc6265CookieProcessor.java | 6 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 68 ++-- java/org/apache/tomcat/util/net/AprEndpoint.java | 6 +- java/org/apache/tomcat/util/net/NioChannel.java | 12 - java/org/apache/tomcat/util/net/NioEndpoint.java | 40 +- .../apache/tomcat/util/net/SecureNio2Channel.java | 25 +- .../apache/tomcat/util/net/SecureNioChannel.java | 42 +-- java/org/apache/tomcat/util/net/SocketWrapper.java | 3 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 38 +- .../tomcat/util/net/jsse/openssl/Cipher.java | 342 +++++++++++++++++ .../tomcat/util/net/jsse/openssl/Encryption.java | 10 +- .../openssl/OpenSSLCipherConfigurationParser.java | 11 +- .../tomcat/util/net/res/LocalStrings.properties | 1 + java/org/apache/tomcat/util/threads/TaskQueue.java | 8 +- .../tomcat/websocket/LocalStrings.properties | 2 +- .../apache/tomcat/websocket/PerMessageDeflate.java | 4 + java/org/apache/tomcat/websocket/WsFrameBase.java | 8 +- .../org/apache/tomcat/websocket/WsFrameClient.java | 2 +- java/org/apache/tomcat/websocket/WsSession.java | 10 +- .../tomcat/websocket/WsWebSocketContainer.java | 2 +- .../apache/tomcat/jdbc/pool/ConnectionPool.java | 44 ++- .../jdbc/pool/interceptor/ResetAbandonedTimer.java | 2 - .../tomcat/jdbc/pool/jmx/ConnectionPool.java | 6 + res/maven/mvn.properties.default | 2 +- .../authenticator/TestFormAuthenticator.java | 2 +- .../catalina/connector/TestCoyoteAdapter.java | 5 +- .../core/TestStandardContextResources.java | 82 ++-- .../realm/TestSecretKeyCredentialHandler.java | 8 +- .../catalina/session/TestStandardSession.java | 177 +++++---- ...on.java => TestStandardSessionIntegration.java} | 2 +- .../apache/catalina/startup/LoggingBaseTest.java | 28 +- .../startup/TestHostConfigAutomaticDeployment.java | 52 +-- .../apache/catalina/startup/TomcatBaseTest.java | 43 +++ .../catalina/valves/TesterAccessLogValve.java | 9 +- .../webresources/AbstractTestDirResourceSet.java | 60 --- .../webresources/AbstractTestFileResourceSet.java | 17 +- .../webresources/AbstractTestResourceSet.java | 2 +- ...unt.java => TestClasspathUrlStreamHandler.java} | 39 +- .../catalina/webresources/TestDirResourceSet.java | 60 ++- .../webresources/TestDirResourceSetInternal.java | 46 ++- .../webresources/TestDirResourceSetMount.java | 32 +- .../webresources/TestDirResourceSetReadOnly.java | 32 +- .../webresources/TestDirResourceSetVirtual.java | 47 ++- .../catalina/webresources/TestFileResourceSet.java | 33 ++ .../webresources/TestFileResourceSetReadOnly.java | 9 +- .../webresources/TestFileResourceSetVirtual.java | 36 +- .../catalina/webresources/TestJarResourceSet.java | 4 +- .../webresources/TestJarResourceSetInternal.java | 4 +- .../webresources/TestJarResourceSetMount.java | 4 +- .../apache/coyote/http11/upgrade/TestUpgrade.java | 66 +++- test/org/apache/el/TestELEvaluation.java | 27 ++ test/org/apache/el/TestELInJsp.java | 47 +-- .../jasper/compiler/TestAttributeParser.java | 21 +- test/org/apache/jasper/compiler/TestELParser.java | 17 +- test/org/apache/jasper/compiler/TestParser.java | 6 +- .../jasper/runtime/TestCustomHttpJspPage.java | 46 +++ .../apache/jasper/runtime/TesterHttpJspBase.java | 70 ++++ .../util/descriptor/tld/TestImplicitTldParser.java | 59 +++ .../tomcat/util/file/TestConfigFileLoader.java | 63 ++++ .../apache/tomcat/util/http/TestRequestUtil.java | 30 ++ .../util/http/TesterHttpMessagesPerformance.java | 44 ++- .../tomcat/util/net/jsse/openssl/TestCipher.java | 40 ++ .../TestOpenSSLCipherConfigurationParser.java | 10 +- .../util/net/jsse/openssl/TesterOpenSSL.java | 20 + .../apache/tomcat/util/threads/TestLimitLatch.java | 210 ++++++++--- .../tomcat/websocket/TestWsWebSocketContainer.java | 38 +- .../bug45451.jspf => tld/implicit-bad.tld} | 36 +- .../bug45451a.jsp => tld/implicit-good.tld} | 25 +- test/webapp/bug45nnn/bug45427.jsp | 28 +- test/webapp/bug45nnn/bug45451.jspf | 8 +- test/webapp/bug45nnn/bug45451a.jsp | 4 +- .../bug45451a.jsp => bug5nnnn/bug58444.jsp} | 15 +- test/webapp/el-method.jsp | 4 +- test/webapp/el-misc.jsp | 18 +- webapps/docs/appdev/sample/index.html | 15 +- webapps/docs/building.xml | 2 +- webapps/docs/changelog.xml | 381 ++++++++++++++++++- webapps/docs/cluster-howto.xml | 4 +- webapps/docs/config/ajp.xml | 8 +- webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/cookie-processor.xml | 11 + webapps/docs/config/credentialhandler.xml | 4 +- webapps/docs/config/http.xml | 15 +- webapps/docs/config/realm.xml | 4 +- webapps/docs/config/sessionidgenerator.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 5 +- webapps/docs/ssl-howto.xml | 2 +- 179 files changed, 3481 insertions(+), 1600 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
