[tomcat7] 01/02: Merge tag 'upstream/7.0.73'

[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 b0d4583dade3808de5cc90ef30addfff4399f744
Merge: 6ada7fd a13e716
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 16 10:50:57 2016 +0100

    Merge tag 'upstream/7.0.73'
    
    Upstream version 7.0.73

 bin/catalina.bat                                   |  10 ++
 build.properties.default                           |   5 +-
 java/javax/annotation/ManagedBean.java             |   2 +-
 java/javax/annotation/PostConstruct.java           |   2 +-
 java/javax/annotation/PreDestroy.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 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |  10 ++
 .../catalina/connector/mbeans-descriptors.xml      |   6 +-
 java/org/apache/catalina/core/StandardServer.java  |   4 +-
 .../apache/catalina/loader/LocalStrings.properties |   2 +-
 .../apache/catalina/manager/StatusTransformer.java |   2 +-
 .../mbeans/JmxRemoteLifecycleListener.java         |  48 ++++---
 .../catalina/session/LocalStrings.properties       |   1 +
 .../apache/catalina/session/StandardSession.java   |   6 +
 .../catalina/startup/LocalStrings.properties       |   1 +
 .../catalina/startup/PasswdUserDatabase.java       | 110 +++------------
 .../tribes/tipis/AbstractReplicatedMap.java        |   3 +-
 .../org/apache/catalina/valves/AccessLogValve.java |   8 +-
 java/org/apache/coyote/AbstractProcessor.java      |  13 +-
 java/org/apache/coyote/AbstractProtocol.java       |  51 ++++---
 java/org/apache/coyote/AsyncStateMachine.java      |  49 +++----
 java/org/apache/coyote/RequestInfo.java            |  10 +-
 .../apache/coyote/ajp/AbstractAjpProcessor.java    |  76 ++++++-----
 .../coyote/http11/AbstractHttp11Processor.java     |  24 ++--
 .../apache/coyote/http11/AbstractInputBuffer.java  |  54 +-------
 .../coyote/http11/InternalAprInputBuffer.java      |  54 ++++----
 .../coyote/http11/InternalAprOutputBuffer.java     |  54 ++++----
 .../apache/coyote/http11/InternalInputBuffer.java  |  41 +++---
 .../coyote/http11/InternalNioInputBuffer.java      |  74 ++++++-----
 .../coyote/http11/InternalNioOutputBuffer.java     |  57 ++++----
 .../apache/coyote/http11/InternalOutputBuffer.java |  50 +++----
 .../apache/coyote/http11/LocalStrings.properties   |   4 +-
 java/org/apache/juli/OneLineFormatter.java         |   2 +-
 java/org/apache/naming/StringManager.java          |  37 ++++--
 .../apache/naming/factory/LocalStrings.properties  |  18 +++
 .../apache/naming/factory/ResourceLinkFactory.java |  22 ++-
 .../apache/tomcat/util/http/parser/HttpParser.java |  98 ++++++++++----
 .../apache/tomcat/util/net/AbstractEndpoint.java   |  83 +++++++-----
 java/org/apache/tomcat/util/net/JIoEndpoint.java   |   6 +-
 java/org/apache/tomcat/util/net/SocketStatus.java  |   6 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                |   2 +-
 .../apache/tomcat/jdbc/pool/PoolConfiguration.java |   4 +-
 .../jdbc/pool/interceptor/StatementCache.java      | 105 ++++++++++++---
 res/checkstyle/checkstyle.xml                      |   9 ++
 res/maven/mvn.properties.default                   |   2 +-
 .../catalina/core/TestApplicationHttpRequest.java  |   4 +-
 .../tomcat/util/http/parser/TestHttpParser.java    |  17 +--
 webapps/docs/cgi-howto.xml                         |   2 +-
 webapps/docs/changelog.xml                         | 147 ++++++++++++++++++++-
 webapps/docs/config/ajp.xml                        |  20 ++-
 webapps/docs/config/http.xml                       |  26 +++-
 webapps/docs/config/listeners.xml                  |  16 +++
 67 files changed, 915 insertions(+), 576 deletions(-)

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