This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 8088fe0961d181538b840dd74bbf78e4325d2ca9 Merge: 7edb8b2 e46a1a5 Author: Emmanuel Bourg <[email protected]> Date: Wed Mar 19 22:29:45 2014 +0100 Merge tag 'upstream/8.0.4' Upstream version 8.0.4 BUILDING.txt | 17 +- bin/catalina.bat | 8 +- bin/configtest.bat | 3 +- bin/cpappend.bat | 33 - bin/digest.bat | 3 +- bin/service.bat | 73 +- bin/shutdown.bat | 3 +- bin/startup.bat | 3 +- bin/tool-wrapper.bat | 3 +- bin/version.bat | 3 +- build.properties.default | 32 +- build.xml | 113 +- conf/server.xml | 11 +- conf/web.xml | 14 +- java/javax/servlet/jsp/JspFactory.java | 6 +- java/org/apache/catalina/Container.java | 8 +- java/org/apache/catalina/Session.java | 11 + .../apache/catalina/ant/AbstractCatalinaTask.java | 24 +- .../catalina/ant/SslConnectorCiphersTask.java | 47 + java/org/apache/catalina/ant/ThreaddumpTask.java | 47 + java/org/apache/catalina/ant/VminfoTask.java | 47 + java/org/apache/catalina/ant/antlib.xml | 12 + java/org/apache/catalina/ant/catalina.tasks | 4 + .../apache/catalina/connector/CoyoteAdapter.java | 26 +- .../catalina/connector/CoyoteInputStream.java | 2 +- .../org/apache/catalina/connector/InputBuffer.java | 2 +- .../apache/catalina/core/ApplicationContext.java | 6 + .../org/apache/catalina/core/AsyncContextImpl.java | 5 +- java/org/apache/catalina/core/ContainerBase.java | 11 + .../apache/catalina/core/LocalStrings.properties | 1 + java/org/apache/catalina/core/StandardContext.java | 9 +- java/org/apache/catalina/core/StandardEngine.java | 16 + java/org/apache/catalina/core/StandardWrapper.java | 7 +- .../apache/catalina/ha/session/DeltaSession.java | 8 +- .../apache/catalina/loader/LocalStrings.properties | 3 + .../apache/catalina/loader/WebappClassLoader.java | 103 +- .../apache/catalina/loader/mbeans-descriptors.xml | 5 - .../apache/catalina/manager/DummyProxySession.java | 10 + .../catalina/manager/LocalStrings.properties | 1 + .../apache/catalina/manager/ManagerServlet.java | 194 +-- .../apache/catalina/manager/StatusTransformer.java | 2 +- java/org/apache/catalina/realm/MemoryRealm.java | 7 +- .../apache/catalina/servlets/DefaultServlet.java | 282 +++-- .../catalina/servlets/LocalStrings.properties | 3 + .../catalina/session/PersistentManagerBase.java | 24 +- .../apache/catalina/session/StandardSession.java | 38 +- java/org/apache/catalina/session/package.html | 3 - .../org/apache/catalina/startup/FailedContext.java | 3 + java/org/apache/catalina/startup/HostConfig.java | 2 +- .../catalina/storeconfig/server-registry.xml | 2 - .../webresources/AbstractArchiveResourceSet.java | 20 +- .../catalina/webresources/AbstractResourceSet.java | 3 +- java/org/apache/catalina/webresources/Cache.java | 2 - .../catalina/webresources/JarResourceRoot.java | 14 +- .../catalina/webresources/LocalStrings.properties | 6 + .../apache/catalina/webresources/StandardRoot.java | 9 +- java/org/apache/coyote/AsyncContextCallback.java | 4 +- java/org/apache/coyote/AsyncStateMachine.java | 15 +- .../apache/coyote/ajp/AbstractAjpProcessor.java | 53 +- java/org/apache/coyote/ajp/AjpNio2Processor.java | 271 +++++ java/org/apache/coyote/ajp/AjpNio2Protocol.java | 166 +++ java/org/apache/coyote/ajp/AjpNioProcessor.java | 2 +- .../coyote/http11/AbstractHttp11Processor.java | 4 +- .../apache/coyote/http11/AbstractInputBuffer.java | 8 + .../apache/coyote/http11/Http11Nio2Processor.java | 578 +++++++++ .../apache/coyote/http11/Http11Nio2Protocol.java | 285 +++++ .../coyote/http11/InternalNio2InputBuffer.java | 932 ++++++++++++++ .../coyote/http11/InternalNio2OutputBuffer.java | 486 ++++++++ .../apache/coyote/http11/LocalStrings.properties | 1 + .../coyote/http11/filters/ChunkedInputFilter.java | 11 +- .../http11/upgrade/AbstractServletInputStream.java | 44 +- .../upgrade/AbstractServletOutputStream.java | 98 +- .../coyote/http11/upgrade/Nio2Processor.java | 44 + .../http11/upgrade/Nio2ServletInputStream.java | 232 ++++ .../http11/upgrade/Nio2ServletOutputStream.java | 175 +++ java/org/apache/el/parser/ELParser.java | 327 ++--- java/org/apache/el/parser/ELParser.jjt | 4 +- java/org/apache/jasper/EmbeddedServletOptions.java | 4 +- java/org/apache/jasper/JspC.java | 21 +- java/org/apache/jasper/compiler/Generator.java | 2 +- java/org/apache/jasper/compiler/JDTCompiler.java | 22 +- .../apache/jasper/compiler/JspDocumentParser.java | 80 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 31 +- java/org/apache/jasper/compiler/Validator.java | 58 +- .../apache/jasper/servlet/JspCServletContext.java | 31 +- java/org/apache/tomcat/util/buf/Ascii.java | 18 +- .../tomcat/util/descriptor/DigesterFactory.java | 86 +- .../tomcat/util/descriptor/LocalResolver.java | 19 + .../tomcat/util/descriptor/LocalStrings.properties | 2 + .../tomcat/util/descriptor/XmlIdentifiers.java | 37 +- .../apache/tomcat/util/descriptor/web/WebXml.java | 689 ++++++----- .../MbeansDescriptorsIntrospectionSource.java | 12 +- java/org/apache/tomcat/util/net/Nio2Channel.java | 221 ++++ java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1265 ++++++++++++++++++++ .../apache/tomcat/util/net/SecureNio2Channel.java | 1005 ++++++++++++++++ .../apache/tomcat/util/net/SocketProperties.java | 57 +- java/org/apache/tomcat/util/scan/Jar.java | 4 +- java/org/apache/tomcat/util/threads/TaskQueue.java | 4 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 37 +- modules/bayeux/build.xml | 2 - modules/jdbc-pool/build.properties.default | 3 + modules/jdbc-pool/build.xml | 2 - modules/jdbc-pool/doc/jdbc-pool.xml | 6 +- .../apache/tomcat/jdbc/test/DefaultTestCase.java | 26 +- modules/tomcat-lite/build.xml | 6 - res/findbugs/filter-false-positives.xml | 9 +- res/ide-support/eclipse/eclipse.classpath | 2 +- .../netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/nb-tomcat.xml | 1 - 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 | 6 +- .../apache/catalina/comet/TestCometProcessor.java | 46 +- .../catalina/core/TestApplicationContext.java | 7 + .../apache/catalina/core/TestAsyncContextImpl.java | 255 ++-- test/org/apache/catalina/core/TesterContext.java | 5 + .../ha/session/TestSerializablePrincipal.java | 90 +- .../apache/catalina/mbeans/TestRegistration.java | 4 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 10 +- .../org/apache/catalina/realm/TestMemoryRealm.java | 37 + .../webresources/AbstractTestResourceSet.java | 55 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 139 +++ .../http11/filters/TestChunkedInputFilter.java | 185 ++- test/org/apache/el/TestELInJsp.java | 26 + test/org/apache/el/TestMethodExpressionImpl.java | 12 - test/org/apache/el/TesterBeanD.java | 40 + test/org/apache/el/parser/TestELParser.java | 115 ++ test/org/apache/el/parser/TesterBeanC.java | 49 + test/org/apache/jasper/TestJspC.java | 10 +- .../jasper/compiler/TestELInterpreterFactory.java | 26 +- test/org/apache/jasper/compiler/TestELParser.java | 19 + test/org/apache/jasper/compiler/TestParser.java | 62 +- .../jasper/servlet/TestJspCServletContext.java | 32 +- test/org/apache/tomcat/util/buf/TestAscii.java | 65 + .../tomcat/util/descriptor/web/TestWebXml.java | 224 +++- .../org/apache/tomcat/util/net/TestClientCert.java | 11 +- test/org/apache/tomcat/util/net/TestCustomSsl.java | 13 +- test/org/apache/tomcat/util/net/TestSsl.java | 9 +- .../tomcat/websocket/TestWebSocketFrameClient.java | 84 +- ...lient.java => TestWebSocketFrameClientSSL.java} | 24 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 11 +- .../tomcat/websocket/TesterFirehoseServer.java | 5 +- test/webapp/WEB-INF/tags/bug55198.tagx | 4 +- .../WEB-INF/tags/{bug55198.tagx => bug56265.tagx} | 20 +- .../tags/bug55198.tagx => bug5nnnn/bug56147.jsp} | 31 +- .../tags/bug55198.tagx => bug5nnnn/bug56265.jsp} | 28 +- webapps/docs/appdev/build.xml.txt | 24 +- webapps/docs/changelog.xml | 279 ++++- webapps/docs/config/ajp.xml | 96 +- webapps/docs/config/cluster.xml | 15 - webapps/docs/config/http.xml | 142 ++- webapps/docs/config/valve.xml | 43 + webapps/docs/default-servlet.xml | 31 +- webapps/docs/deployer-howto.xml | 8 +- webapps/docs/funcspecs/fs-admin-objects.xml | 4 - webapps/docs/jasper-howto.xml | 4 +- webapps/docs/jndi-datasource-examples-howto.xml | 20 +- webapps/docs/jndi-resources-howto.xml | 6 +- webapps/docs/realm-howto.xml | 2 +- webapps/docs/security-howto.xml | 10 +- webapps/docs/windows-service-howto.xml | 22 +- webapps/examples/websocket/echo.xhtml | 4 +- 164 files changed, 9680 insertions(+), 1655 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
