[tomcat7] 01/11: Merge tag 'upstream/7.0.65'

[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 2648dcc830646081c3ce818a42e169ab95e3c676
Merge: 3cd5015 f8d2cf6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 22 20:24:42 2015 +0200

    Merge tag 'upstream/7.0.65'
    
    Upstream version 7.0.65

 bin/catalina.sh                                    |   10 +-
 build.properties.default                           |    2 +-
 build.xml                                          |    3 +-
 java/javax/servlet/http/Cookie.java                |    4 +-
 java/org/apache/catalina/Globals.java              |   33 +-
 .../catalina/authenticator/LocalStrings.properties |    2 +-
 .../authenticator/SpnegoAuthenticator.java         |    4 +-
 .../org/apache/catalina/connector/InputBuffer.java |    6 +-
 .../catalina/connector/LocalStrings.properties     |    2 +
 .../apache/catalina/connector/OutputBuffer.java    |    6 +-
 java/org/apache/catalina/connector/Request.java    |    5 +-
 .../core/JreMemoryLeakPreventionListener.java      |    6 +-
 .../apache/catalina/core/LocalStrings.properties   |    2 +
 java/org/apache/catalina/core/StandardContext.java |    8 +-
 java/org/apache/catalina/core/StandardHost.java    |    6 +-
 java/org/apache/catalina/core/StandardService.java |    2 +-
 .../apache/catalina/deploy/LocalStrings.properties |    4 +-
 .../org/apache/catalina/filters/ExpiresFilter.java |  432 +--
 .../catalina/filters/LocalStrings.properties       |    6 +-
 java/org/apache/catalina/ha/ClusterRuleSet.java    |   16 +
 .../apache/catalina/ha/session/DeltaSession.java   |   18 +-
 .../catalina/ha/session/JvmRouteBinderValve.java   |    2 +-
 .../catalina/ha/session/LocalStrings.properties    |    6 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |    6 +-
 .../apache/catalina/loader/JdbcLeakPrevention.java |   13 +-
 .../apache/catalina/loader/LocalStrings.properties |    1 +
 .../catalina/loader/ParallelWebappClassLoader.java |  100 +
 .../catalina/loader/StandardClassLoader.java       |    2 +-
 .../apache/catalina/loader/WebappClassLoader.java  | 3772 +-------------------
 ...ClassLoader.java => WebappClassLoaderBase.java} |  347 +-
 java/org/apache/catalina/loader/WebappLoader.java  |   10 +-
 .../apache/catalina/loader/mbeans-descriptors.xml  |   44 +
 .../apache/catalina/realm/LocalStrings.properties  |    2 +-
 .../catalina/realm/LocalStrings_es.properties      |    2 +-
 .../catalina/security/SecurityClassLoad.java       |    2 +-
 .../apache/catalina/session/StandardSession.java   |   37 +-
 java/org/apache/catalina/startup/Bootstrap.java    |   29 +-
 .../catalina/startup/ClassLoaderFactory.java       |   18 +-
 java/org/apache/catalina/startup/HostConfig.java   |   40 +-
 .../catalina/startup/LocalStrings.properties       |    2 +
 .../tribes/tipis/AbstractReplicatedMap.java        |   12 +-
 .../apache/catalina/valves/JDBCAccessLogValve.java |    2 +-
 .../coyote/http11/AbstractHttp11Processor.java     |    3 +-
 .../coyote/http11/InternalAprInputBuffer.java      |   12 +-
 .../apache/coyote/http11/LocalStrings.properties   |    3 +
 .../upgrade/AbstractServletOutputStream.java       |    2 +-
 java/org/apache/el/parser/ELParser.jjt             |    2 +-
 .../org/apache/el/parser/ELParserTokenManager.java |    2 +-
 .../apache/jasper/compiler/AttributeParser.java    |   14 +-
 java/org/apache/jasper/compiler/ELParser.java      |    9 +-
 java/org/apache/jasper/compiler/Generator.java     |  121 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |   14 +-
 .../apache/jasper/compiler/JspDocumentParser.java  |    6 +-
 java/org/apache/jasper/compiler/JspReader.java     |   40 +-
 java/org/apache/jasper/compiler/Parser.java        |  117 +-
 .../jasper/resources/LocalStrings.properties       |    2 +-
 .../org/apache/jasper/util/FastRemovalDequeue.java |   24 +-
 java/org/apache/juli/AsyncFileHandler.java         |    2 -
 java/org/apache/juli/ClassLoaderLogManager.java    |   12 +-
 .../apache/tomcat/InstrumentableClassLoader.java   |    4 +-
 java/org/apache/tomcat/util/compat/JreCompat.java  |   13 +-
 java/org/apache/tomcat/util/compat/JreVendor.java  |   49 +
 java/org/apache/tomcat/util/http/RequestUtil.java  |   20 +-
 java/org/apache/tomcat/util/net/AprEndpoint.java   |    4 +-
 java/org/apache/tomcat/util/net/NioChannel.java    |   12 -
 java/org/apache/tomcat/util/net/NioEndpoint.java   |    3 -
 .../apache/tomcat/util/net/SecureNioChannel.java   |    2 -
 .../tomcat/util/net/jsse/JSSESocketFactory.java    |   21 +-
 .../tomcat/util/net/res/LocalStrings.properties    |    1 +
 .../tomcat/websocket/LocalStrings.properties       |    2 +-
 .../apache/tomcat/websocket/PerMessageDeflate.java |    4 +
 java/org/apache/tomcat/websocket/WsSession.java    |    4 +-
 .../tomcat/websocket/WsWebSocketContainer.java     |    2 +-
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    |   44 +-
 .../jdbc/pool/interceptor/ResetAbandonedTimer.java |    2 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       |    6 +
 res/maven/mvn.properties.default                   |    2 +-
 .../loader/TestParallelWebappClassLoader.java      |  134 +
 .../loader/TestWebappClassLoaderMemoryLeak.java    |    2 +-
 ...TestWebappClassLoaderThreadLocalMemoryLeak.java |   16 +-
 .../loader/TestWebappClassLoaderWeaving.java       |    2 +-
 .../catalina/session/TestStandardSession.java      |  177 +-
 ...on.java => TestStandardSessionIntegration.java} |    4 +-
 .../catalina/startup/TestTomcatClassLoader.java    |    4 +-
 .../catalina/valves/TesterAccessLogValve.java      |    9 +-
 test/org/apache/el/TestELEvaluation.java           |   27 +
 test/org/apache/el/TestELInJsp.java                |   47 +-
 .../jasper/compiler/TestAttributeParser.java       |   21 +-
 test/org/apache/jasper/compiler/TestELParser.java  |   17 +-
 test/org/apache/jasper/compiler/TestParser.java    |    6 +-
 .../jasper/runtime/TestCustomHttpJspPage.java      |   54 +
 .../apache/jasper/runtime/TesterHttpJspBase.java   |   70 +
 .../apache/tomcat/util/http/TestRequestUtil.java   |   30 +
 test/org/apache/tomcat/util/net/TestSsl.java       |    3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |   73 +-
 .../tomcat/websocket/TestWsWebSocketContainer.java |   38 +-
 test/webapp-3.0/bug45nnn/bug45427.jsp              |   28 +-
 test/webapp-3.0/bug45nnn/bug45451.jspf             |    8 +-
 test/webapp-3.0/bug45nnn/bug45451a.jsp             |    4 +-
 .../bug45451a.jsp => bug5nnnn/bug58444.jsp}        |   15 +-
 test/webapp-3.0/el-method.jsp                      |    4 +-
 test/webapp-3.0/el-misc.jsp                        |   18 +-
 webapps/docs/changelog.xml                         |  170 +-
 webapps/docs/cluster-howto.xml                     |    4 +-
 webapps/docs/config/ajp.xml                        |    8 +-
 webapps/docs/config/http.xml                       |    8 +-
 webapps/docs/config/loader.xml                     |    6 +-
 107 files changed, 1938 insertions(+), 4675 deletions(-)

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