[tomcat7] branch master updated (a6262b8 -> 6fda755)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jul 29 15:35:19 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat7.
from a6262b8 prepare for upload
adds c5e7d45 Imported Upstream version 7.0.55
new 0376d7e Merge tag 'upstream/7.0.55'
new 6fda755 Refreshed the patches
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/daemon.sh | 4 +-
build.properties.default | 16 +-
build.xml | 49 +-
debian/changelog | 7 +
...-deploy-webapps-target-from-deploy-target.patch | 9 +-
debian/patches/0010-debianize-build-xml.patch | 2 +-
java/org/apache/catalina/Context.java | 31 +-
java/org/apache/catalina/Wrapper.java | 2 +-
.../catalina/authenticator/SingleSignOn.java | 19 +
.../apache/catalina/connector/CoyoteAdapter.java | 85 +-
.../catalina/connector/LocalStrings.properties | 3 +
.../apache/catalina/connector/MapperListener.java | 111 ++-
.../apache/catalina/connector/OutputBuffer.java | 14 +-
java/org/apache/catalina/connector/Request.java | 2 +-
java/org/apache/catalina/connector/Response.java | 56 +-
.../catalina/connector/mbeans-descriptors.xml | 4 +
.../catalina/core/ApplicationHttpRequest.java | 23 +
java/org/apache/catalina/core/ContainerBase.java | 40 +-
.../catalina/core/DefaultInstanceManager.java | 87 +-
.../apache/catalina/core/LocalStrings.properties | 2 +
java/org/apache/catalina/core/StandardContext.java | 72 +-
java/org/apache/catalina/core/StandardHost.java | 17 +
.../apache/catalina/core/StandardHostValve.java | 4 +-
java/org/apache/catalina/core/StandardServer.java | 8 +
.../apache/catalina/core/StandardWrapperValve.java | 2 +-
.../catalina/deploy/ApplicationListener.java | 29 +
java/org/apache/catalina/deploy/WebXml.java | 30 +-
.../apache/catalina/ha/session/DeltaSession.java | 4 -
java/org/apache/catalina/realm/MemoryRuleSet.java | 4 +-
java/org/apache/catalina/realm/package.html | 52 +-
.../catalina/security/SecurityClassLoad.java | 1 +
.../apache/catalina/servlets/WebdavServlet.java | 2 +
.../catalina/session/PersistentManagerBase.java | 32 +-
java/org/apache/catalina/startup/TldConfig.java | 1 +
.../apache/catalina/startup/WebAnnotationSet.java | 163 ++--
.../apache/catalina/valves/ErrorReportValve.java | 63 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../catalina/valves/StuckThreadDetectionValve.java | 116 ++-
java/org/apache/coyote/AbstractProcessor.java | 59 +-
java/org/apache/coyote/AbstractProtocol.java | 12 +-
java/org/apache/coyote/ActionCode.java | 9 +
java/org/apache/coyote/Adapter.java | 6 +-
...extCallback.java => ContainerThreadMarker.java} | 25 +-
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 | 33 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 195 +++--
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 2 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 66 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 4 +-
java/org/apache/coyote/ajp/AjpNioProcessor.java | 68 +-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 4 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 67 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 4 +-
java/org/apache/coyote/ajp/Constants.java | 1 +
.../coyote/http11/AbstractHttp11JsseProtocol.java | 4 +-
.../coyote/http11/AbstractHttp11Processor.java | 374 ++++----
.../coyote/http11/AbstractHttp11Protocol.java | 23 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 10 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 4 +-
.../apache/coyote/http11/Http11AprProcessor.java | 116 +--
.../apache/coyote/http11/Http11AprProtocol.java | 10 +-
.../apache/coyote/http11/Http11NioProcessor.java | 145 ++--
.../apache/coyote/http11/Http11NioProtocol.java | 10 +-
java/org/apache/coyote/http11/Http11Processor.java | 66 +-
java/org/apache/coyote/http11/Http11Protocol.java | 10 +-
.../coyote/http11/InternalAprInputBuffer.java | 9 +-
.../coyote/http11/InternalAprOutputBuffer.java | 4 +-
.../apache/coyote/http11/InternalInputBuffer.java | 9 +-
.../coyote/http11/InternalNioInputBuffer.java | 7 +-
.../coyote/http11/InternalNioOutputBuffer.java | 2 +-
.../apache/coyote/http11/InternalOutputBuffer.java | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 143 ++--
.../coyote/http11/filters/IdentityInputFilter.java | 22 +-
.../coyote/http11/filters}/LocalStrings.properties | 22 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 5 +
.../http11/upgrade/AbstractServletInputStream.java | 48 +-
.../upgrade/AbstractServletOutputStream.java | 140 ++-
.../apache/coyote/http11/upgrade/AprProcessor.java | 5 +-
.../http11/upgrade/AprServletOutputStream.java | 3 +-
.../apache/coyote/http11/upgrade/BioProcessor.java | 5 +-
.../http11/upgrade/BioServletOutputStream.java | 7 +-
.../coyote/http11/upgrade/LocalStrings.properties | 2 +
.../apache/coyote/http11/upgrade/NioProcessor.java | 5 +-
.../http11/upgrade/NioServletOutputStream.java | 7 +-
.../coyote/http11/upgrade/UpgradeProcessor.java | 5 +
java/org/apache/jasper/compiler/ELParser.java | 21 +-
java/org/apache/jasper/compiler/Generator.java | 14 +-
java/org/apache/jasper/compiler/JspReader.java | 40 +
java/org/apache/jasper/compiler/Parser.java | 27 +-
java/org/apache/jasper/compiler/Validator.java | 8 +-
.../util/http/mapper/LocalStrings.properties | 8 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 945 +++++++++++++--------
.../util/http/mapper/WrapperMappingInfo.java | 58 ++
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 10 +-
.../util/net/DefaultServerSocketFactory.java | 2 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 13 +-
java/org/apache/tomcat/util/net/NioChannel.java | 20 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 18 +-
.../apache/tomcat/util/net/SSLImplementation.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 1 +
java/org/apache/tomcat/util/net/SocketStatus.java | 2 +-
.../tomcat/util/net/jsse/JSSEImplementation.java | 4 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 4 +-
.../tomcat/util/net/res/LocalStrings.properties | 2 +
.../tomcat/websocket/WsWebSocketContainer.java | 1 +
.../tomcat/websocket/server/WsServerContainer.java | 12 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
res/tomcat.nsi | 2 +-
.../catalina/connector/TestMapperListener.java | 124 +++
.../apache/catalina/core/TestAsyncContextImpl.java | 13 +-
.../catalina/core/TestNamingContextListener.java | 7 +-
.../apache/catalina/core/TestStandardContext.java | 53 ++
.../catalina/core/TestSwallowAbortedUploads.java | 82 +-
.../catalina/session/TestPersistentManager.java | 235 +++++
.../catalina/session/TestStandardSession.java | 103 +++
.../apache/catalina/startup/SimpleHttpClient.java | 5 +
test/org/apache/catalina/startup/TestListener.java | 4 +-
.../apache/catalina/startup/TomcatBaseTest.java | 10 +-
.../valves/TestStuckThreadDetectionValve.java | 162 ++++
.../apache/catalina/websocket/TestWebSocket.java | 8 -
.../coyote/http11/TestAbstractHttp11Processor.java | 99 ++-
test/org/apache/el/TestELEvaluation.java | 5 +
test/org/apache/el/TestELInJsp.java | 18 +
.../jasper/compiler/TestELInterpreterFactory.java | 4 +-
test/org/apache/jasper/compiler/TestELParser.java | 13 +
test/org/apache/jasper/compiler/TestGenerator.java | 29 +
test/org/apache/jasper/compiler/TestParser.java | 12 +-
.../apache/tomcat/util/http/mapper/TestMapper.java | 286 ++++++-
.../util/http/mapper/TestMapperContextRoot.java | 79 --
.../tomcat/util/http/mapper/TestMapperWebapps.java | 190 +++++
.../util/http/mapper/TestMapperWelcomeFiles.java | 94 --
test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 +-
.../util/net/jsse/TesterBug50640SslImpl.java | 2 +-
.../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 | 34 +-
.../websocket/pojo/TestEncodingDecoding.java | 11 +-
.../websocket/pojo/TestPojoEndpointBase.java | 7 +-
.../websocket/pojo/TestPojoMethodMapping.java | 4 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
test/util/TestCookieFilter.java | 93 ++
test/webapp-3.0/WEB-INF/bug53545.tld | 17 +
test/webapp-3.0/bug5nnnn/bug53545.html | 16 +
test/webapp-3.0/bug5nnnn/bug56334.jspx | 40 -
test/webapp-3.0/bug5nnnn/bug56334and56561.jspx | 68 ++
.../webapp-3.0/bug5nnnn/bug56581.jsp | 15 +-
.../webapp-3.0/bug5nnnn/bug56612.jsp | 6 +-
webapps/docs/changelog.xml | 276 +++++-
webapps/docs/config/context.xml | 8 +
webapps/docs/config/host.xml | 9 +
webapps/docs/config/http.xml | 18 +
webapps/docs/config/realm.xml | 6 +-
webapps/docs/config/valve.xml | 27 +-
webapps/docs/manager-howto.xml | 2 +-
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 ++
167 files changed, 4709 insertions(+), 1968 deletions(-)
copy java/org/apache/coyote/{AsyncContextCallback.java => ContainerThreadMarker.java} (66%)
create mode 100644 java/org/apache/coyote/ErrorState.java
copy java/{javax/el => org/apache/coyote/http11/filters}/LocalStrings.properties (50%)
create mode 100644 java/org/apache/tomcat/util/http/mapper/WrapperMappingInfo.java
create mode 100644 test/org/apache/catalina/connector/TestMapperListener.java
create mode 100644 test/org/apache/catalina/session/TestPersistentManager.java
create mode 100644 test/org/apache/catalina/session/TestStandardSession.java
create mode 100644 test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
delete mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperContextRoot.java
create mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperWebapps.java
delete mode 100644 test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
create mode 100644 test/util/TestCookieFilter.java
delete mode 100644 test/webapp-3.0/bug5nnnn/bug56334.jspx
create mode 100644 test/webapp-3.0/bug5nnnn/bug56334and56561.jspx
copy webapps/host-manager/index.jsp => test/webapp-3.0/bug5nnnn/bug56581.jsp (73%)
copy webapps/examples/WEB-INF/tags/helloWorld.tag => test/webapp-3.0/bug5nnnn/bug56612.jsp (96%)
create mode 100644 webapps/examples/WEB-INF/classes/util/CookieFilter.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list