[tomcat8] 02/03: Merge tag 'upstream/8.0.23'

[Emmanuel Bourg]

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

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

commit 96d0ccc117fd48ce57fd6aea25361c5d111c117d
Merge: ae569db e0e583b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 26 16:01:42 2015 +0200

    Merge tag 'upstream/8.0.23'
    
    Upstream version 8.0.23

 build.properties.default                           |   4 +-
 build.xml                                          |   1 +
 conf/web.xml                                       |  49 +++++
 java/javax/el/ELResolver.java                      |   1 +
 .../authenticator/SpnegoAuthenticator.java         | 162 ++++++++++++++
 java/org/apache/catalina/filters/CorsFilter.java   |   4 +-
 java/org/apache/catalina/filters/FilterBase.java   |   3 +-
 .../catalina/filters/HttpHeaderSecurityFilter.java | 232 +++++++++++++++++++++
 .../catalina/filters/LocalStrings.properties       |   3 +
 .../ha/authenticator/ClusterSingleSignOn.java      |  10 +-
 .../ha/authenticator/LocalStrings.properties       |  17 ++
 .../catalina/ha/context/LocalStrings.properties    |  19 ++
 .../catalina/ha/context/ReplicatedContext.java     |   6 +-
 .../ha/session/ClusterSessionListener.java         |   7 +-
 .../apache/catalina/ha/session/DeltaRequest.java   |  12 +-
 .../apache/catalina/ha/session/DeltaSession.java   |   4 +-
 .../catalina/ha/session/LocalStrings.properties    |   5 +
 .../apache/catalina/ha/tcp/LocalStrings.properties |  12 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  22 +-
 .../catalina/loader/WebappClassLoaderBase.java     |   4 +
 .../tribes/tipis/AbstractReplicatedMap.java        |   2 +-
 java/org/apache/catalina/valves/RemoteIpValve.java |  16 ++
 .../apache/jasper/compiler/TagFileProcessor.java   | 129 ++++++------
 .../jasper/resources/LocalStrings.properties       |   5 +
 java/org/apache/jasper/servlet/TldScanner.java     |  35 +++-
 .../tomcat/util/http/LegacyCookieProcessor.java    |  10 +-
 .../apache/tomcat/util/net/SecureNio2Channel.java  | 175 +++++++++-------
 .../apache/tomcat/util/net/SecureNioChannel.java   |  23 +-
 .../tomcat/util/net/res/LocalStrings.properties    |   1 +
 res/maven/mvn-pub.xml                              |   8 +
 res/maven/mvn.properties.default                   |   2 +-
 test/javax/el/TestELResolver.java                  |  13 ++
 .../apache/catalina/valves/TestRemoteIpValve.java  |  44 ++--
 webapps/docs/changelog.xml                         | 129 +++++++++++-
 webapps/docs/class-loader-howto.xml                |   8 +-
 webapps/docs/config/filter.xml                     |  80 +++++++
 webapps/docs/config/systemprops.xml                |  14 ++
 webapps/docs/config/valve.xml                      |  11 +
 webapps/docs/security-howto.xml                    |   7 +
 39 files changed, 1081 insertions(+), 208 deletions(-)

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