[tomcat7] 01/03: Merge tag 'upstream/7.0.70'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 658c8d8274be87e14293637e94d72019dda86b2f
Merge: 0336a01 c9fe70c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 15 23:58:40 2016 +0200

    Merge tag 'upstream/7.0.70'
    
    Upstream version 7.0.70

 BUILDING.txt                                       |  19 +-
 bin/catalina.sh                                    |  23 +-
 build.properties.default                           |   4 +-
 build.xml                                          |  59 ++---
 java/javax/servlet/ServletRequest.java             |   9 +-
 .../catalina/authenticator/SingleSignOnEntry.java  |   3 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |  17 +-
 .../org/apache/catalina/connector/InputBuffer.java |   4 +-
 .../catalina/connector/LocalStrings.properties     |   1 +
 .../apache/catalina/connector/OutputBuffer.java    |   9 +-
 java/org/apache/catalina/connector/Request.java    |  14 +-
 java/org/apache/catalina/connector/Response.java   |  12 +-
 .../apache/catalina/core/ApplicationContext.java   |  19 +-
 .../catalina/core/ApplicationDispatcher.java       |   2 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |  27 +--
 java/org/apache/catalina/core/ContainerBase.java   |  15 +-
 .../core/JreMemoryLeakPreventionListener.java      |  34 +--
 .../apache/catalina/core/LocalStrings.properties   |   1 -
 java/org/apache/catalina/core/StandardContext.java |  33 ++-
 .../apache/catalina/core/StandardWrapperValve.java |   6 +-
 .../apache/catalina/core/mbeans-descriptors.xml    |   6 +-
 .../catalina/filters/HttpHeaderSecurityFilter.java |   2 +-
 .../catalina/ha/context/ReplicatedContext.java     |   4 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |   9 +-
 .../apache/catalina/loader/LocalStrings.properties |   2 +
 .../catalina/loader/WebappClassLoaderBase.java     | 169 +++++++++-----
 java/org/apache/catalina/loader/WebappLoader.java  |   2 +
 java/org/apache/catalina/realm/RealmBase.java      |  26 ++-
 .../apache/catalina/session/StandardSession.java   |   3 +-
 .../catalina/tribes/group/ChannelCoordinator.java  |  35 ++-
 .../tribes/group/ChannelInterceptorBase.java       |  18 ++
 .../apache/catalina/tribes/group/GroupChannel.java |  24 +-
 .../interceptors/MessageDispatch15Interceptor.java |   8 +-
 .../interceptors/MessageDispatchInterceptor.java   |   8 +-
 .../group/interceptors/TcpPingInterceptor.java     |   7 +-
 .../catalina/tribes/membership/McastService.java   |  18 +-
 .../tribes/membership/McastServiceImpl.java        |  31 ++-
 .../catalina/tribes/membership/MemberImpl.java     |   2 +-
 .../tribes/tipis/AbstractReplicatedMap.java        |  57 ++++-
 .../catalina/tribes/transport/ReceiverBase.java    |  21 +-
 .../tribes/transport/ReplicationTransmitter.java   |  12 +
 .../catalina/tribes/transport/bio/BioReceiver.java |   8 +-
 .../catalina/tribes/transport/nio/NioReceiver.java |   8 +-
 .../apache/catalina/util/LocalStrings.properties   |   2 +-
 java/org/apache/catalina/util/URLEncoder.java      |  10 +
 .../apache/catalina/valves/ErrorReportValve.java   |   3 +-
 .../catalina/valves/StuckThreadDetectionValve.java |   7 +-
 java/org/apache/coyote/AbstractProtocol.java       |  18 +-
 java/org/apache/coyote/ActionCode.java             |   6 +
 java/org/apache/coyote/AsyncStateMachine.java      |  43 ++--
 .../apache/coyote/ajp/AbstractAjpProcessor.java    |   5 +
 .../coyote/http11/AbstractHttp11Processor.java     |   5 +
 .../apache/coyote/http11/Http11NioProtocol.java    |   4 +-
 .../coyote/http11/InternalAprInputBuffer.java      |  14 +-
 .../apache/coyote/http11/InternalInputBuffer.java  |  17 +-
 .../coyote/http11/InternalNioInputBuffer.java      |  13 +-
 .../apache/coyote/http11/LocalStrings.properties   |   2 +-
 java/org/apache/el/parser/ELParser.java            |  11 +-
 .../apache/jasper/compiler/JspRuntimeContext.java  |   3 +-
 .../apache/jasper/compiler/TagLibraryInfoImpl.java |   9 +-
 .../jasper/resources/LocalStrings.properties       |   1 +
 .../apache/jasper/servlet/JspCServletContext.java  |   8 +-
 java/org/apache/tomcat/util/buf/MessageBytes.java  |   4 +-
 java/org/apache/tomcat/util/compat/Jre9Compat.java |  50 +++++
 java/org/apache/tomcat/util/compat/JreCompat.java  |  43 +++-
 .../tomcat/util/http/FastHttpDateFormat.java       |   9 +-
 java/org/apache/tomcat/util/http/RequestUtil.java  |  16 +-
 .../util/http/fileupload/MultipartStream.java      |  13 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  27 ++-
 .../tomcat/websocket/BackgroundProcessManager.java |  21 ++
 java/org/apache/tomcat/websocket/WsSession.java    |  37 ++--
 .../websocket/server/WsHttpUpgradeHandler.java     |   5 -
 .../tomcat/websocket/server/WsServerContainer.java |   5 +-
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    |  19 +-
 res/maven/mvn.properties.default                   |   2 +-
 res/tomcat.nsi                                     |   4 -
 res/welcome.bin.html                               |   4 -
 res/welcome.main.html                              |   4 -
 .../catalina/connector/TestMapperListener.java     |   4 +-
 .../apache/catalina/core/TestAsyncContextImpl.java | 227 +++++++++++++++++++
 .../loader/TestWebappClassLoaderWeaving.java       |   1 +
 test/org/apache/catalina/startup/TestTomcat.java   |   2 +-
 .../catalina/valves/TesterAccessLogValve.java      |   6 +-
 .../coyote/http11/TestAbstractHttp11Processor.java | 148 +++++++++++++
 .../coyote/http11/TestInternalInputBuffer.java     |  57 +++++
 .../apache/tomcat/util/http/TestRequestUtil.java   |  40 ++++
 .../tomcat/util/http/mapper/TestMapperWebapps.java |   4 +-
 test/org/apache/tomcat/util/net/TestCustomSsl.java |   2 +-
 test/org/apache/tomcat/util/net/TestSsl.java       |   4 +-
 .../tomcat/websocket/TestWebSocketFrameClient.java |   6 +-
 .../websocket/TestWebSocketFrameClientSSL.java     |   6 +-
 .../tomcat/websocket/TestWsPingPongMessages.java   |   3 +-
 .../tomcat/websocket/TestWsRemoteEndpoint.java     |   3 +-
 .../tomcat/websocket/TestWsSubprotocols.java       |   3 +-
 .../tomcat/websocket/TestWsWebSocketContainer.java | 105 +++++++--
 .../apache/tomcat/websocket/WebSocketBaseTest.java |  51 +++++
 .../apache/tomcat/websocket/server/TestClose.java  |  24 +-
 ...stCloseBug58264.java => TestCloseBug58624.java} |  46 +++-
 .../server/TestWsRemoteEndpointImplServer.java     |   4 +-
 .../websocket/server/TestWsServerContainer.java    |   4 +-
 webapps/docs/changelog.xml                         | 243 +++++++++++++++++++--
 webapps/docs/config/cluster-interceptor.xml        | 106 +++++----
 webapps/docs/config/context.xml                    |  20 +-
 webapps/docs/config/filter.xml                     |   2 +-
 webapps/docs/config/listeners.xml                  |   6 +
 webapps/docs/config/realm.xml                      |   7 +
 webapps/docs/ssl-howto.xml                         |  97 +++-----
 107 files changed, 1925 insertions(+), 541 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git