[tomcat7] 01/04: Merge tag 'upstream/7.0.74'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jan 24 12:16:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 5bf41ebc90ebbce27b33e5c79c1e2919946c8c07
Merge: 22aa8c9 7109aac
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Jan 16 01:37:04 2017 +0100
Merge tag 'upstream/7.0.74'
Upstream version 7.0.74
BUILDING.txt | 18 +
NOTICE | 2 +-
bin/catalina.bat | 10 +-
build.properties.default | 4 +-
build.xml | 11 +-
java/javax/servlet/ServletRequest.java | 2 +-
java/javax/servlet/annotation/ServletSecurity.java | 2 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 2 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 6 +-
.../servlet/jsp/tagext/TagLibraryValidator.java | 2 +-
.../servlet/resources/j2ee_web_services_1_1.xsd | 2 +-
.../resources/j2ee_web_services_client_1_1.xsd | 2 +-
java/javax/servlet/resources/javaee_5.xsd | 2 +-
java/javax/servlet/resources/javaee_6.xsd | 2 +-
.../servlet/resources/javaee_web_services_1_2.xsd | 2 +-
.../servlet/resources/javaee_web_services_1_3.xsd | 2 +-
.../resources/javaee_web_services_client_1_2.xsd | 2 +-
.../resources/javaee_web_services_client_1_3.xsd | 2 +-
java/javax/servlet/resources/web-app_2_2.dtd | 2 +-
java/javax/servlet/resources/web-app_2_3.dtd | 2 +-
java/org/apache/catalina/AccessLog.java | 3 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 2 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +-
.../catalina/authenticator/AuthenticatorBase.java | 61 +-
.../catalina/authenticator/FormAuthenticator.java | 4 +-
.../catalina/authenticator/LocalStrings.properties | 1 +
.../org/apache/catalina/authenticator/package.html | 2 +-
.../catalina/connector/LocalStrings.properties | 2 +-
java/org/apache/catalina/connector/Request.java | 2 +-
.../catalina/core/ApplicationContextFacade.java | 4 +-
.../catalina/core/ApplicationDispatcher.java | 2 +-
.../apache/catalina/core/AprLifecycleListener.java | 2 +-
.../core/JreMemoryLeakPreventionListener.java | 84 ++-
.../apache/catalina/core/LocalStrings.properties | 6 +-
java/org/apache/catalina/core/StandardContext.java | 8 +-
.../apache/catalina/core/StandardContextValve.java | 22 +-
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
.../catalina/core/StandardWrapperFacade.java | 2 +-
.../apache/catalina/core/mbeans-descriptors.xml | 4 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 8 +-
.../apache/catalina/filters/RemoteIpFilter.java | 2 +-
.../catalina/filters/RequestDumperFilter.java | 2 +-
.../apache/catalina/ha/backend/CollectedInfo.java | 2 +-
.../catalina/ha/backend/HeartbeatListener.java | 4 +-
.../catalina/ha/backend/MultiCastSender.java | 2 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 4 +-
.../catalina/ha/deploy/LocalStrings.properties | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/ha/session/LocalStrings.properties | 2 +-
.../catalina/ha/session/mbeans-descriptors.xml | 2 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
.../apache/catalina/loader/LocalStrings.properties | 3 +-
.../catalina/loader/WebappClassLoaderBase.java | 73 ++-
java/org/apache/catalina/manager/Constants.java | 12 +-
.../catalina/manager/HTMLManagerServlet.java | 2 +-
.../apache/catalina/manager/JMXProxyServlet.java | 2 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../apache/catalina/realm/GenericPrincipal.java | 3 +
java/org/apache/catalina/realm/JNDIRealm.java | 63 +-
.../apache/catalina/realm/LocalStrings.properties | 3 +-
java/org/apache/catalina/realm/RealmBase.java | 10 +-
.../apache/catalina/security/SecurityListener.java | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
.../apache/catalina/servlets/DefaultServlet.java | 2 +-
.../catalina/servlets/LocalStrings.properties | 2 +-
java/org/apache/catalina/session/ManagerBase.java | 2 +-
.../apache/catalina/session/mbeans-descriptors.xml | 4 +-
.../org/apache/catalina/startup/ContextConfig.java | 4 +-
.../catalina/startup/LifecycleListenerRule.java | 2 +-
.../startup/SafeForkJoinWorkerThreadFactory.java | 46 ++
java/org/apache/catalina/startup/Tomcat.java | 319 +++++-----
.../apache/catalina/tribes/ChannelException.java | 2 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 2 +-
.../interceptors/DomainFilterInterceptor.java | 18 +-
.../interceptors/FragmentationInterceptor.java | 4 +-
.../group/interceptors/NonBlockingCoordinator.java | 2 +-
.../group/interceptors/OrderInterceptor.java | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 15 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 10 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 8 +-
.../tribes/transport/bio/BioReplicationTask.java | 2 +-
.../tribes/transport/nio/NioReplicationTask.java | 2 +-
.../apache/catalina/util/ExtensionValidator.java | 4 +-
.../org/apache/catalina/valves/AccessLogValve.java | 4 +
.../apache/catalina/valves/JDBCAccessLogValve.java | 4 +
.../apache/catalina/valves/LocalStrings.properties | 1 +
java/org/apache/catalina/valves/RemoteIpValve.java | 2 +-
.../catalina/valves/StuckThreadDetectionValve.java | 4 +-
.../apache/coyote/http11/Http11AprProcessor.java | 29 +-
java/org/apache/el/lang/ELSupport.java | 55 +-
java/org/apache/el/lang/ExpressionBuilder.java | 8 +-
java/org/apache/el/parser/AstFunction.java | 43 +-
java/org/apache/jasper/compiler/Generator.java | 32 +-
java/org/apache/jasper/compiler/JspConfig.java | 6 +-
java/org/apache/jasper/compiler/Node.java | 2 +-
java/org/apache/jasper/compiler/PageInfo.java | 6 +-
java/org/apache/jasper/compiler/SmapUtil.java | 2 +-
.../apache/jasper/compiler/TagFileProcessor.java | 26 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../compiler/tagplugin/TagPluginContext.java | 2 +-
.../jasper/resources/LocalStrings.properties | 2 +-
.../jasper/runtime/JspApplicationContextImpl.java | 2 +-
.../jasper/tagplugins/jstl/core/Otherwise.java | 2 +-
.../apache/jasper/tagplugins/jstl/core/Param.java | 2 +-
.../org/apache/jasper/util/FastRemovalDequeue.java | 4 +-
java/org/apache/juli/ClassLoaderLogManager.java | 2 +-
java/org/apache/juli/FileHandler.java | 3 +-
java/org/apache/tomcat/jni/Registry.java | 2 +-
java/org/apache/tomcat/jni/Status.java | 2 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
java/org/apache/tomcat/util/buf/package.html | 2 +-
java/org/apache/tomcat/util/compat/Jre9Compat.java | 6 +-
java/org/apache/tomcat/util/compat/JreCompat.java | 4 +-
java/org/apache/tomcat/util/digester/package.html | 16 +-
.../tomcat/util/http/res/LocalStrings.properties | 1 +
.../apache/tomcat/util/modeler/BaseModelMBean.java | 2 +-
java/org/apache/tomcat/util/modeler/Registry.java | 4 +-
.../tomcat/util/modeler/mbeans-descriptors.dtd | 2 +-
.../tomcat/util/modeler/modules/package.html | 2 +-
java/org/apache/tomcat/util/modeler/package.html | 2 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 50 ++
java/org/apache/tomcat/util/net/AprEndpoint.java | 39 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 22 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
.../websocket/AsyncChannelWrapperSecure.java | 2 +-
.../tomcat/websocket/pojo/LocalStrings.properties | 4 +-
modules/jdbc-pool/NOTICE | 2 +-
modules/jdbc-pool/build.properties.default | 2 +-
modules/jdbc-pool/build.xml | 4 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 15 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 89 ++-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 2 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 96 +++
.../apache/tomcat/jdbc/pool/JdbcInterceptor.java | 2 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 4 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 23 +
.../jdbc/pool/interceptor/AbstractQueryReport.java | 2 +-
.../jdbc/pool/interceptor/mbeans-descriptors.xml | 2 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 45 +-
.../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java | 19 +
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 40 ++
.../tomcat/jdbc/test/TestSlowQueryReport.java | 2 +-
res/findbugs/filter-false-positives.xml | 2 +-
res/header.bmp | Bin 9742 -> 10198 bytes
.../eclipse/java-compiler-errors-warnings.txt | 2 +-
res/maven/mvn.properties.default | 2 +-
res/side_left.bmp | Bin 345238 -> 345238 bytes
.../catalina/connector/TestCoyoteAdapter.java | 8 +-
.../org/apache/catalina/connector/TestRequest.java | 4 +-
.../apache/catalina/connector/TestSendFile.java | 128 +++-
.../apache/catalina/filters/TestCorsFilter.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 1 -
.../catalina/filters/TestRemoteIpFilter.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 1 -
test/org/apache/catalina/startup/TestTomcat.java | 32 +
.../coyote/ajp/TestAbstractAjpProcessor.java | 2 +-
test/org/apache/el/TestELEvaluation.java | 49 +-
test/org/apache/el/TestELInJsp.java | 17 +
test/org/apache/el/TesterFunctions.java | 78 +++
.../jasper/compiler/TestAttributeParser.java | 24 +-
.../apache/jasper/runtime/TestPageContextImpl.java | 1 -
.../tomcat/util/http/parser/TestMediaType.java | 2 +-
.../org/apache/tomcat/util/net/TestClientCert.java | 6 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 20 +-
.../apache/tomcat/websocket/server/TestClose.java | 1 -
test/webapp-3.0/WEB-INF/test.tld | 17 +
test/webapp-3.0/bug6nnnn/bug60431.jsp | 25 +
webapps/ROOT/asf-logo-wide.gif | Bin 5866 -> 0 bytes
webapps/ROOT/asf-logo-wide.svg | 279 +++++++++
webapps/ROOT/asf-logo.png | Bin 17811 -> 0 bytes
webapps/ROOT/build.xml | 93 ---
webapps/ROOT/tomcat.css | 2 +-
webapps/ROOT/tomcat.svg | 646 ++++++++++++++++-----
webapps/docs/appdev/sample/web/images/tomcat.gif | Bin 1441 -> 2066 bytes
webapps/docs/changelog.xml | 205 ++++++-
webapps/docs/cluster-howto.xml | 18 +-
webapps/docs/config/cluster-interceptor.xml | 4 +
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/config/cluster.xml | 15 +
webapps/docs/config/context.xml | 8 +-
webapps/docs/config/filter.xml | 2 +-
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/listeners.xml | 12 +
webapps/docs/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/docs/images/asf-logo.svg | 210 +++++++
webapps/docs/images/tomcat.png | Bin 0 -> 5103 bytes
webapps/docs/jndi-datasource-examples-howto.xml | 4 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
webapps/docs/monitoring.xml | 10 +-
webapps/docs/security-howto.xml | 36 ++
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 33 +-
.../compressionFilters/CompressionFilter.java | 2 +-
.../websocket/drawboard/DrawboardEndpoint.java | 2 +-
.../WEB-INF/classes/websocket/drawboard/Room.java | 8 +-
webapps/examples/websocket/drawboard.xhtml | 2 +-
webapps/host-manager/WEB-INF/jsp/403.jsp | 2 +-
webapps/host-manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/host-manager/images/asf-logo.svg | 210 +++++++
webapps/host-manager/images/tomcat.gif | Bin 1934 -> 2066 bytes
webapps/manager/WEB-INF/jsp/403.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
webapps/manager/images/asf-logo.gif | Bin 7279 -> 0 bytes
webapps/manager/images/asf-logo.svg | 210 +++++++
206 files changed, 3259 insertions(+), 916 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list