[tomcat8] 01/03: Merge tag 'upstream/8.0.9'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jun 24 20:38:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit bb01e665e75f915565f7cf0ef4d8529270a6dd8d
Merge: dc1d8a6 e5dd173
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 24 21:09:08 2014 +0200
Merge tag 'upstream/8.0.9'
Upstream version 8.0.9
build.properties.default | 8 +-
build.xml | 22 +-
java/javax/el/ELProcessor.java | 83 ++++-
java/javax/servlet/http/Cookie.java | 36 +-
java/org/apache/catalina/Context.java | 5 +-
.../authenticator/DigestAuthenticator.java | 4 +-
.../apache/catalina/connector/CoyoteAdapter.java | 62 +++-
.../catalina/connector/LocalStrings.properties | 5 +-
.../apache/catalina/connector/OutputBuffer.java | 17 +-
java/org/apache/catalina/connector/Request.java | 2 +-
java/org/apache/catalina/connector/Response.java | 62 ++--
.../catalina/core/ApplicationFilterChain.java | 12 +-
.../catalina/core/DefaultInstanceManager.java | 94 ++---
java/org/apache/catalina/core/StandardContext.java | 85 +++--
java/org/apache/catalina/core/StandardHost.java | 17 +
.../apache/catalina/core/StandardHostValve.java | 4 +-
.../apache/catalina/core/StandardWrapperValve.java | 2 +-
.../catalina/deploy/NamingResourcesImpl.java | 5 +-
.../apache/catalina/ha/session/DeltaSession.java | 4 -
.../apache/catalina/loader/LocalStrings.properties | 6 +-
.../catalina/loader/LocalStrings_es.properties | 2 -
.../apache/catalina/loader/WebappClassLoader.java | 56 +--
java/org/apache/catalina/realm/MemoryRuleSet.java | 4 +-
java/org/apache/catalina/realm/package.html | 52 +--
.../catalina/security/SecurityClassLoad.java | 2 +
.../apache/catalina/servlets/WebdavServlet.java | 2 +
.../org/apache/catalina/startup/ContextConfig.java | 4 +-
.../org/apache/catalina/startup/FailedContext.java | 5 +-
.../apache/catalina/startup/WebAnnotationSet.java | 19 +-
.../apache/catalina/valves/ErrorReportValve.java | 63 ++--
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../catalina/valves/StuckThreadDetectionValve.java | 116 +++++-
java/org/apache/coyote/AbstractProcessor.java | 54 ++-
java/org/apache/coyote/AbstractProtocol.java | 5 +-
java/org/apache/coyote/ActionCode.java | 9 +
java/org/apache/coyote/Adapter.java | 6 +-
java/org/apache/coyote/ErrorState.java | 69 ++++
java/org/apache/coyote/LocalStrings.properties | 2 +
java/org/apache/coyote/Processor.java | 2 +
java/org/apache/coyote/Response.java | 43 +--
.../apache/coyote/ajp/AbstractAjpProcessor.java | 317 +++++++++--------
java/org/apache/coyote/ajp/AjpNio2Processor.java | 2 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 5 +-
.../coyote/http11/AbstractHttp11Processor.java | 394 ++++++++++++---------
.../coyote/http11/AbstractHttp11Protocol.java | 21 ++
.../apache/coyote/http11/AbstractInputBuffer.java | 8 +-
.../coyote/http11/AbstractNioInputBuffer.java | 5 +
.../apache/coyote/http11/AbstractOutputBuffer.java | 2 -
.../apache/coyote/http11/Http11AprProcessor.java | 97 ++---
.../apache/coyote/http11/Http11AprProtocol.java | 6 +-
.../apache/coyote/http11/Http11Nio2Processor.java | 121 ++++---
.../apache/coyote/http11/Http11Nio2Protocol.java | 15 +-
.../apache/coyote/http11/Http11NioProcessor.java | 128 +++----
.../apache/coyote/http11/Http11NioProtocol.java | 6 +-
java/org/apache/coyote/http11/Http11Processor.java | 54 +--
java/org/apache/coyote/http11/Http11Protocol.java | 6 +-
.../coyote/http11/InternalAprInputBuffer.java | 7 +-
.../apache/coyote/http11/InternalInputBuffer.java | 7 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 150 +++++---
.../coyote/http11/filters/IdentityInputFilter.java | 19 +-
.../coyote/http11/filters/LocalStrings.properties | 27 ++
.../coyote/http11/filters/VoidInputFilter.java | 17 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 5 +
.../upgrade/AbstractServletOutputStream.java | 47 ++-
.../apache/coyote/http11/upgrade/AprProcessor.java | 5 +-
.../http11/upgrade/AprServletOutputStream.java | 4 +-
.../apache/coyote/http11/upgrade/BioProcessor.java | 5 +-
.../http11/upgrade/BioServletOutputStream.java | 6 +-
.../coyote/http11/upgrade/Nio2Processor.java | 7 +-
.../http11/upgrade/Nio2ServletInputStream.java | 41 +--
.../http11/upgrade/Nio2ServletOutputStream.java | 13 +-
.../apache/coyote/http11/upgrade/NioProcessor.java | 5 +-
.../http11/upgrade/NioServletOutputStream.java | 6 +-
java/org/apache/coyote/spdy/SpdyProcessor.java | 142 +++++---
java/org/apache/jasper/compiler/ELParser.java | 21 +-
java/org/apache/jasper/compiler/Generator.java | 14 +-
java/org/apache/jasper/compiler/JspReader.java | 52 +++
java/org/apache/jasper/compiler/Parser.java | 43 +--
java/org/apache/jasper/compiler/Validator.java | 8 +-
.../apache/jasper/servlet/JasperInitializer.java | 19 +-
java/org/apache/jasper/servlet/JspServlet.java | 6 +-
java/org/apache/jasper/servlet/TldPreScanned.java | 55 +++
java/org/apache/jasper/servlet/TldScanner.java | 4 +-
java/org/apache/juli/logging/LogFactory.java | 76 ++--
java/org/apache/naming/factory/EjbFactory.java | 120 ++-----
java/org/apache/naming/factory/FactoryBase.java | 138 ++++++++
.../apache/naming/factory/ResourceEnvFactory.java | 103 +-----
.../org/apache/naming/factory/ResourceFactory.java | 160 +++------
.../apache/naming/factory/TransactionFactory.java | 103 +-----
java/org/apache/tomcat/SimpleInstanceManager.java | 68 ++++
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 10 +-
.../org/apache/tomcat/util/http/CookieSupport.java | 24 +-
.../apache/tomcat/util/http/SetCookieSupport.java | 209 +++++------
.../tomcat/util/http/parser/Authorization.java | 141 ++++++++
.../apache/tomcat/util/http/parser/HttpParser.java | 192 +---------
.../apache/tomcat/util/http/parser/MediaType.java | 61 +++-
.../tomcat/util/http/parser/MediaTypeCache.java | 2 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 67 ++++
java/org/apache/tomcat/util/net/AprEndpoint.java | 76 +---
java/org/apache/tomcat/util/net/JIoEndpoint.java | 55 +--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 86 +----
java/org/apache/tomcat/util/net/NioChannel.java | 20 ++
java/org/apache/tomcat/util/net/NioEndpoint.java | 28 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 5 +-
java/org/apache/tomcat/util/net/SocketStatus.java | 2 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
.../websocket/WsRemoteEndpointImplClient.java | 8 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 12 +
.../pojo/PojoMessageHandlerPartialBase.java | 4 +-
.../pojo/PojoMessageHandlerWholeBase.java | 4 +-
.../tomcat/websocket/server/WsServerContainer.java | 12 +-
res/findbugs/filter-false-positives.xml | 5 +-
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/rat/rat-excludes.txt | 14 +
res/tomcat.nsi | 2 +-
test/javax/el/TestELProcessor.java | 58 +++
.../javax/el/TesterFunctions.java | 33 +-
test/javax/servlet/http/TestCookie.java | 102 +++---
...trict.java => TestCookieNetscapeValidator.java} | 31 +-
.../servlet/http/TestCookieRFC2109Validator.java | 33 +-
...Strict.java => TestCookieRFC6265Validator.java} | 24 +-
test/javax/servlet/http/TestCookieStrict.java | 8 +-
.../authenticator/TestFormAuthenticator.java | 4 +-
.../catalina/connector/TestMaxConnections.java | 8 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 13 +-
.../catalina/core/TestNamingContextListener.java | 7 +-
.../apache/catalina/core/TestStandardContext.java | 53 +++
.../catalina/core/TestSwallowAbortedUploads.java | 77 +++-
test/org/apache/catalina/core/TesterContext.java | 5 +-
.../catalina/servlets/TestDefaultServlet.java | 4 +-
.../catalina/servlets/TestWebdavServlet.java | 4 +-
.../catalina/session/TestStandardSession.java | 103 ++++++
.../apache/catalina/startup/SimpleHttpClient.java | 5 +
test/org/apache/catalina/startup/TestListener.java | 4 +-
test/org/apache/catalina/startup/TestTomcat.java | 10 +-
.../apache/catalina/startup/TomcatBaseTest.java | 11 +-
.../valves/TestStuckThreadDetectionValve.java | 165 +++++++++
.../coyote/http11/TestAbstractHttp11Processor.java | 102 +++++-
test/org/apache/el/TestELEvaluation.java | 5 +
test/org/apache/el/TestELInJsp.java | 20 ++
...Context.java => TestJspCompilationContext.java} | 2 +-
.../jasper/compiler/TestELInterpreterFactory.java | 4 +-
test/org/apache/jasper/compiler/TestELParser.java | 13 +
test/org/apache/jasper/compiler/TestGenerator.java | 39 +-
test/org/apache/jasper/compiler/TestParser.java | 12 +-
test/org/apache/jasper/servlet/TestJspServlet.java | 81 +++++
.../tomcat/util/http/TestSetCookieSupport.java | 10 +-
.../TestSetCookieSupportSeparatorsAllowed.java | 6 +-
.../util/http/parser/TestAuthorizationDigest.java | 48 +--
.../tomcat/util/http/parser/TestMediaType.java | 14 +-
test/org/apache/tomcat/util/net/TestCustomSsl.java | 4 +-
test/org/apache/tomcat/util/net/TestSsl.java | 7 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 6 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 4 +-
.../websocket/TestWebSocketFrameClientSSL.java | 7 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 4 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +-
.../tomcat/websocket/TestWsSubprotocols.java | 4 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 71 ++--
.../tomcat/websocket/TesterConnectionLimit.java | 4 +-
.../websocket/pojo/TestEncodingDecoding.java | 10 +-
.../websocket/pojo/TestPojoEndpointBase.java | 7 +-
.../websocket/pojo/TestPojoMethodMapping.java | 4 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
test/util/TestCookieFilter.java | 93 +++++
test/webapp/WEB-INF/bug53545.tld | 17 +
.../bug56529.jsp => WEB-INF/jsp/error.jsp} | 14 +-
test/webapp/bug5nnnn/bug53545.html | 16 +
test/webapp/bug5nnnn/bug56334.jspx | 40 ---
test/webapp/bug5nnnn/bug56334and56561.jspx | 68 ++++
test/webapp/bug5nnnn/bug56529.jsp | 8 +-
.../webapp/bug5nnnn/{bug56529.jsp => bug56581.jsp} | 21 +-
.../webapp/bug5nnnn/{bug56529.jsp => bug56612.jsp} | 9 +-
webapps/docs/changelog.xml | 333 +++++++++++++++--
webapps/docs/config/ajp.xml | 2 -
webapps/docs/config/context.xml | 8 +
webapps/docs/config/host.xml | 9 +
webapps/docs/config/http.xml | 20 +-
webapps/docs/config/realm.xml | 6 +-
webapps/docs/config/valve.xml | 27 +-
webapps/docs/manager-howto.xml | 2 +-
webapps/docs/realm-howto.xml | 6 +-
webapps/docs/web-socket-howto.xml | 7 +-
.../examples/WEB-INF/classes/CookieExample.java | 1 +
.../WEB-INF/classes/RequestHeaderExample.java | 14 +-
.../WEB-INF/classes/util/CookieFilter.java | 81 +++++
.../classes/websocket/echo/EchoAnnotation.java | 5 +
.../websocket/echo/EchoAsyncAnnotation.java | 128 +++++++
...hoAnnotation.java => EchoStreamAnnotation.java} | 57 +--
.../WEB-INF/classes/websocket/echo/servers.json | 20 ++
webapps/examples/websocket/echo.xhtml | 15 +-
196 files changed, 4516 insertions(+), 2562 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