[tomcat8] 04/06: Merge tag 'upstream/8.0.38'

[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 50ae74e596703db02a192e481708ef567b5727c5
Merge: e3b9525 35c4f84
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 19 09:17:49 2016 +0200

    Merge tag 'upstream/8.0.38'
    
    Upstream version 8.0.38

 bin/catalina.bat                                   |  14 +
 bin/catalina.sh                                    |   4 +
 build.properties.default                           |   6 +-
 build.xml                                          |  10 +-
 conf/catalina.policy                               |  10 +
 conf/catalina.properties                           |   2 +-
 java/javax/annotation/ManagedBean.java             |   2 +-
 java/javax/annotation/PostConstruct.java           |   2 +-
 java/javax/annotation/PreDestroy.java              |   2 +-
 java/javax/annotation/Priority.java                |   2 +-
 java/javax/annotation/Resources.java               |   2 +-
 java/javax/annotation/security/DeclareRoles.java   |   2 +-
 java/javax/annotation/security/RunAs.java          |   2 +-
 .../javax/annotation/sql/DataSourceDefinition.java |   2 +-
 .../annotation/sql/DataSourceDefinitions.java      |   2 +-
 java/javax/ejb/EJBs.java                           |   2 +-
 java/javax/persistence/PersistenceContexts.java    |   2 +-
 java/javax/persistence/PersistenceUnits.java       |   2 +-
 java/javax/servlet/annotation/HandlesTypes.java    |   2 +-
 java/javax/servlet/annotation/MultipartConfig.java |   2 +-
 java/javax/servlet/annotation/ServletSecurity.java |   2 +-
 java/javax/servlet/annotation/WebFilter.java       |   2 +-
 java/javax/servlet/annotation/WebInitParam.java    |   2 +-
 java/javax/servlet/annotation/WebListener.java     |   2 +-
 java/javax/servlet/annotation/WebServlet.java      |   2 +-
 java/javax/xml/ws/WebServiceRefs.java              |   2 +-
 .../catalina/loader/WebappClassLoaderBase.java     |   8 +-
 .../apache/catalina/manager/StatusTransformer.java |   2 +-
 java/org/apache/catalina/servlets/CGIServlet.java  |   2 +-
 .../catalina/session/LocalStrings.properties       |   1 +
 .../apache/catalina/session/StandardSession.java   |   6 +
 .../org/apache/catalina/startup/ContextConfig.java |   2 +-
 .../catalina/startup/LocalStrings.properties       |   1 +
 .../catalina/startup/PasswdUserDatabase.java       | 115 +------
 .../apache/catalina/valves/rewrite/Resolver.java   |   2 +
 .../catalina/valves/rewrite/ResolverImpl.java      |   5 +
 .../catalina/valves/rewrite/RewriteCond.java       |   4 -
 .../catalina/valves/rewrite/RewriteRule.java       |  10 +
 .../catalina/valves/rewrite/RewriteValve.java      | 186 ++++++----
 .../catalina/valves/rewrite/Substitution.java      |  15 +-
 ...rce.java => AbstractSingleArchiveResource.java} |  27 +-
 ....java => AbstractSingleArchiveResourceSet.java} |  38 +--
 .../catalina/webresources/CachedResource.java      |   2 +-
 .../apache/catalina/webresources/JarResource.java  |  26 +-
 .../catalina/webresources/JarResourceSet.java      |  88 +----
 .../catalina/webresources/JarWarResource.java      |   5 +-
 .../apache/catalina/webresources/StandardRoot.java |  18 +-
 .../TomcatURLStreamHandlerFactory.java             |   4 +-
 .../{JarResource.java => WarResource.java}         |  38 +--
 .../catalina/webresources/WarResourceSet.java      |  64 ++++
 .../{WarURLStreamHandler.java => war/Handler.java} |  35 +-
 .../webresources/{ => war}/WarURLConnection.java   |  23 +-
 java/org/apache/coyote/AsyncStateMachine.java      | 222 ++++++------
 java/org/apache/coyote/RequestInfo.java            |  10 +-
 .../coyote/http11/AbstractHttp11Processor.java     |   4 +-
 .../apache/jasper/compiler/JspRuntimeContext.java  |  29 --
 .../apache/jasper/security/SecurityClassLoad.java  |   2 -
 .../apache/jasper/servlet/JasperInitializer.java   |   2 -
 java/org/apache/juli/OneLineFormatter.java         |   2 +-
 java/org/apache/naming/JndiPermission.java         |  62 ----
 java/org/apache/naming/StringManager.java          |  13 +-
 .../apache/naming/factory/LocalStrings.properties  |  18 +
 .../apache/naming/factory/ResourceLinkFactory.java |  22 +-
 java/org/apache/tomcat/util/buf/UriUtil.java       |  23 ++
 java/org/apache/tomcat/util/digester/Digester.java | 250 ++++++--------
 java/org/apache/tomcat/util/scan/JarFactory.java   |  14 +-
 .../tomcat/util/scan/StandardJarScanner.java       |  19 +-
 java/org/apache/tomcat/util/scan/UrlJar.java       |   2 +-
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    |   4 +
 .../apache/tomcat/jdbc/pool/PoolConfiguration.java |   4 +-
 .../jdbc/pool/interceptor/StatementCache.java      | 105 +++++-
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       |   4 +-
 res/checkstyle/checkstyle.xml                      |   6 +
 res/maven/mvn.properties.default                   |   2 +-
 res/rat/rat-excludes.txt                           |   9 +-
 test/javax/servlet/http/TestCookie.java            |   2 +-
 .../servlet/http/TestCookieRFC6265Validator.java   |   2 +-
 .../catalina/core/TestApplicationHttpRequest.java  |   4 +-
 .../catalina/loader/TestWebappClassLoader.java     |   4 +-
 .../catalina/valves/rewrite/TestRewriteValve.java  | 375 ++++++++++++++++++++-
 .../TestHandler.java}                              |  35 +-
 .../TestHandlerIntegration.java}                   |   8 +-
 .../{ => war}/TestWarURLConnection.java            |   4 +-
 webapps/docs/changelog.xml                         | 177 +++++++++-
 webapps/docs/config/jar-scanner.xml                |   6 +
 webapps/docs/config/listeners.xml                  |  16 +
 webapps/docs/config/resources.xml                  |  64 ++++
 webapps/docs/config/systemprops.xml                |   2 +-
 webapps/docs/security-manager-howto.xml            |  60 ++--
 89 files changed, 1539 insertions(+), 861 deletions(-)

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