[tomcat8] 02/05: Merge tag 'upstream/8.0.22'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/8.0.22-1
in repository tomcat8.

commit 4f09a72d0b36533fc866ed96ea1914eb9c9b0fb2
Merge: 924c3bd 6c92e2a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 6 09:51:57 2015 +0200

    Merge tag 'upstream/8.0.22'
    
    Upstream version 8.0.22

 RELEASE-NOTES                                      |    1 -
 bin/catalina.sh                                    |    2 +
 build.properties.default                           |   10 +-
 build.xml                                          |   54 +-
 conf/catalina.properties                           |    2 +-
 .../catalina/authenticator/SingleSignOn.java       |    2 +-
 java/org/apache/catalina/connector/Response.java   |   62 +-
 .../apache/catalina/core/LocalStrings.properties   |    7 +
 java/org/apache/catalina/core/StandardContext.java |   17 +-
 .../catalina/filters/LocalStrings.properties       |    1 +
 .../apache/catalina/filters/RemoteIpFilter.java    |   58 +-
 .../catalina/ha/session/ClusterManagerBase.java    |   14 +
 .../apache/catalina/ha/session/DeltaRequest.java   |    4 +-
 .../apache/catalina/ha/session/DeltaSession.java   |   18 +-
 .../catalina/ha/session/mbeans-descriptors.xml     |   14 +-
 java/org/apache/catalina/startup/HostConfig.java   |  100 +-
 .../tribes/tipis/AbstractReplicatedMap.java        |   13 +-
 java/org/apache/catalina/util/Introspection.java   |    8 +-
 .../catalina/valves/AbstractAccessLogValve.java    |   81 +-
 .../apache/catalina/valves/LocalStrings.properties |    1 +
 .../catalina/valves/rewrite/RewriteValve.java      |   23 -
 .../catalina/valves/rewrite/Substitution.java      |    9 +-
 java/org/apache/catalina/webresources/Cache.java   |    4 +-
 .../catalina/webresources/JarWarResource.java      |    2 +-
 .../apache/catalina/webresources/StandardRoot.java |    2 +-
 .../catalina/webresources/WarURLStreamHandler.java |    6 +-
 java/org/apache/coyote/AbstractProcessor.java      |   11 +-
 java/org/apache/coyote/ajp/AjpNio2Protocol.java    |    6 -
 java/org/apache/coyote/ajp/AjpNioProtocol.java     |    6 -
 .../coyote/http11/AbstractHttp11Protocol.java      |   13 +-
 .../apache/coyote/http11/Http11AprProtocol.java    |   31 -
 .../apache/coyote/http11/Http11Nio2Protocol.java   |   27 -
 .../apache/coyote/http11/Http11NioProtocol.java    |   28 -
 java/org/apache/coyote/http11/Http11Protocol.java  |   20 -
 .../coyote/http11/InternalNio2OutputBuffer.java    |   14 +
 .../apache/coyote/http11/LocalStrings.properties   |    2 +
 java/org/apache/coyote/http11/NpnHandler.java      |   58 -
 java/org/apache/coyote/spdy/SpdyAprNpnHandler.java |  112 --
 java/org/apache/coyote/spdy/SpdyProcessor.java     |  648 ----------
 java/org/apache/coyote/spdy/SpdyProxyProtocol.java |  142 --
 java/org/apache/el/Messages.properties             |    2 +
 java/org/apache/el/parser/AstValue.java            |   32 +-
 java/org/apache/jasper/JspCompilationContext.java  |    5 +
 .../apache/jasper/servlet/JspServletWrapper.java   |    7 +
 java/org/apache/tomcat/jni/Library.java            |   10 +-
 java/org/apache/tomcat/jni/Poll.java               |   17 -
 java/org/apache/tomcat/jni/SSLExt.java             |  159 ---
 java/org/apache/tomcat/jni/socket/AprSocket.java   |  922 -------------
 .../apache/tomcat/jni/socket/AprSocketContext.java | 1352 --------------------
 java/org/apache/tomcat/jni/socket/HostInfo.java    |   84 --
 java/org/apache/tomcat/spdy/CompressDeflater6.java |  178 ---
 java/org/apache/tomcat/spdy/NetSupportOpenSSL.java |  208 ---
 java/org/apache/tomcat/spdy/NetSupportSocket.java  |  171 ---
 java/org/apache/tomcat/spdy/SpdyConnection.java    |  681 ----------
 java/org/apache/tomcat/spdy/SpdyContext.java       |  216 ----
 java/org/apache/tomcat/spdy/SpdyFrame.java         |  354 -----
 java/org/apache/tomcat/spdy/SpdyStream.java        |  308 -----
 java/org/apache/tomcat/util/digester/Digester.java |    6 -
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |   10 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |   10 +-
 .../apache/tomcat/util/net/SecureNio2Channel.java  |  105 +-
 java/org/apache/tomcat/util/scan/JarFactory.java   |    2 +-
 .../tomcat/websocket/LocalStrings.properties       |    2 +-
 .../apache/tomcat/websocket/PerMessageDeflate.java |   54 +-
 java/org/apache/tomcat/websocket/Util.java         |    4 +
 .../org/apache/tomcat/websocket/WsFrameClient.java |   11 +
 .../tomcat/websocket/WsWebSocketContainer.java     |   13 +-
 .../server/WsRemoteEndpointImplServer.java         |    3 +-
 res/checkstyle/org-import-control.xml              |    5 -
 res/maven/mvn-pub.xml                              |    5 +-
 res/maven/mvn.properties.default                   |    2 +-
 .../{tomcat-spdy.pom => tomcat-storeconfig.pom}    |   20 +-
 .../apache/catalina/connector/TesterResponse.java  |   31 +
 .../apache/catalina/core/TestStandardContext.java  |    4 +-
 .../catalina/filters/TestRemoteIpFilter.java       |  150 ++-
 ...TestWebappClassLoaderThreadLocalMemoryLeak.java |   17 +
 .../startup/TestHostConfigAutomaticDeployment.java |   32 +-
 .../catalina/valves/rewrite/TestRewriteValve.java  |   14 +
 .../valves/rewrite/TesterRewriteMapA.java}         |   27 +-
 .../webresources/TestWarURLConnection.java         |    2 +-
 ...onnection.java => TestWarURLStreamHandler.java} |    4 +-
 ...ava => TestWarURLStreamHandlerIntegration.java} |   35 +-
 test/org/apache/el/TestMethodExpressionImpl.java   |   49 +
 test/org/apache/el/TesterBeanB.java                |   15 +
 .../tomcat/websocket/TestWebSocketFrameClient.java |   51 +
 .../apache/tomcat/websocket/TesterEchoServer.java  |   18 +
 webapps/docs/changelog.xml                         |  226 +++-
 webapps/docs/class-loader-howto.xml                |    1 -
 webapps/docs/config/ajp.xml                        |    4 +-
 webapps/docs/config/cluster-manager.xml            |    7 +
 webapps/docs/config/cluster.xml                    |    6 +-
 webapps/docs/config/http.xml                       |   12 +-
 webapps/docs/config/valve.xml                      |   20 +-
 webapps/docs/security-howto.xml                    |   12 +-
 94 files changed, 1195 insertions(+), 6133 deletions(-)

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