[tomcat8] 03/05: Merge tag 'upstream/8.5.11'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Jan 17 14:11:57 UTC 2017


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

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

commit 8387d974da6a9187f1321ffc9789b903038cb1d3
Merge: d9c5499 915f6d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 11 08:54:01 2017 +0100

    Merge tag 'upstream/8.5.11'
    
    Upstream version 8.5.11

 MERGE.txt                                          |  2 +-
 build.properties.default                           |  2 +-
 build.xml                                          |  6 +-
 java/javax/servlet/FilterRegistration.java         |  2 +-
 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 +-
 java/javax/servlet/resources/javaee_7.xsd          |  2 +-
 .../servlet/resources/javaee_web_services_1_2.xsd  |  2 +-
 .../servlet/resources/javaee_web_services_1_3.xsd  |  2 +-
 .../servlet/resources/javaee_web_services_1_4.xsd  |  2 +-
 .../resources/javaee_web_services_client_1_2.xsd   |  2 +-
 .../resources/javaee_web_services_client_1_3.xsd   |  2 +-
 .../resources/javaee_web_services_client_1_4.xsd   |  2 +-
 java/javax/servlet/resources/jsp_2_0.xsd           |  2 +-
 java/javax/servlet/resources/jsp_2_2.xsd           |  2 +-
 java/javax/servlet/resources/jsp_2_3.xsd           |  2 +-
 java/javax/servlet/resources/web-app_2_2.dtd       |  2 +-
 java/javax/servlet/resources/web-app_2_3.dtd       |  2 +-
 java/javax/servlet/resources/web-app_3_1.xsd       |  2 +-
 .../servlet/resources/web-jsptaglibrary_1_1.dtd    |  6 +-
 .../servlet/resources/web-jsptaglibrary_1_2.dtd    |  6 +-
 .../servlet/resources/web-jsptaglibrary_2_0.xsd    |  6 +-
 java/org/apache/catalina/Session.java              |  2 +-
 .../catalina/ant/jmx/JMXAccessorQueryTask.java     |  2 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |  2 +-
 .../catalina/authenticator/FormAuthenticator.java  |  4 +-
 .../jaspic/AuthConfigFactoryImpl.java              | 10 ++--
 .../org/apache/catalina/authenticator/package.html |  2 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |  2 +-
 .../catalina/connector/CoyoteOutputStream.java     |  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      | 28 +++++++++
 .../apache/catalina/core/LocalStrings.properties   |  8 +--
 java/org/apache/catalina/core/StandardContext.java | 14 ++---
 java/org/apache/catalina/core/StandardHost.java    |  4 +-
 java/org/apache/catalina/core/StandardWrapper.java |  4 +-
 .../catalina/core/StandardWrapperFacade.java       |  2 +-
 .../apache/catalina/core/mbeans-descriptors.xml    |  4 +-
 .../catalina/deploy/NamingResourcesImpl.java       |  2 +-
 .../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    |  4 +-
 .../catalina/ha/session/mbeans-descriptors.xml     |  2 +-
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  2 +-
 .../apache/catalina/manager/JMXProxyServlet.java   |  2 +-
 .../apache/catalina/realm/LocalStrings.properties  |  2 +-
 java/org/apache/catalina/realm/RealmBase.java      |  4 +-
 .../apache/catalina/security/SecurityListener.java |  2 +-
 java/org/apache/catalina/servlets/CGIServlet.java  |  2 +-
 .../apache/catalina/servlets/DefaultServlet.java   |  4 +-
 .../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 |  6 +-
 .../catalina/startup/LifecycleListenerRule.java    |  2 +-
 .../startup/SafeForkJoinWorkerThreadFactory.java   | 46 +++++++++++++++
 .../storeconfig/ConnectorStoreAppender.java        |  6 +-
 .../apache/catalina/storeconfig/StoreAppender.java |  4 +-
 .../storeconfig/StoreConfigLifecycleListener.java  |  2 +-
 .../catalina/storeconfig/StoreFactoryBase.java     |  6 +-
 .../apache/catalina/tribes/ChannelException.java   |  2 +-
 java/org/apache/catalina/tribes/ErrorHandler.java  |  2 +-
 .../apache/catalina/tribes/group/RpcCallback.java  |  2 +-
 .../interceptors/FragmentationInterceptor.java     |  4 +-
 .../group/interceptors/LocalStrings.properties     |  2 +-
 .../group/interceptors/NonBlockingCoordinator.java |  2 +-
 .../group/interceptors/OrderInterceptor.java       |  4 +-
 .../tribes/tipis/AbstractReplicatedMap.java        |  2 +-
 .../catalina/tribes/tipis/LazyReplicatedMap.java   | 10 ++--
 .../catalina/tribes/tipis/ReplicatedMap.java       |  8 +--
 .../tribes/transport/bio/BioReplicationTask.java   |  2 +-
 .../tribes/transport/bio/LocalStrings.properties   |  2 +-
 .../tribes/transport/nio/NioReplicationTask.java   |  2 +-
 .../apache/catalina/util/ExtensionValidator.java   |  4 +-
 java/org/apache/catalina/util/Introspection.java   |  2 +-
 java/org/apache/catalina/valves/RemoteIpValve.java |  2 +-
 .../catalina/valves/StuckThreadDetectionValve.java |  4 +-
 .../catalina/valves/rewrite/RewriteValve.java      |  2 +-
 .../apache/catalina/webresources/StandardRoot.java |  2 +-
 .../TomcatURLStreamHandlerFactory.java             |  4 +-
 java/org/apache/coyote/AbstractProtocol.java       | 14 +++++
 java/org/apache/coyote/InputBuffer.java            |  4 +-
 java/org/apache/coyote/LocalStrings.properties     |  3 +
 java/org/apache/coyote/http2/HPackHuffman.java     |  2 +-
 java/org/apache/coyote/http2/Hpack.java            |  2 +-
 .../apache/coyote/http2/LocalStrings.properties    |  6 +-
 java/org/apache/coyote/http2/Stream.java           |  6 +-
 .../apache/coyote/http2/StreamStateMachine.java    |  2 +-
 java/org/apache/jasper/compiler/Generator.java     | 18 ++----
 java/org/apache/jasper/compiler/JspConfig.java     |  6 +-
 java/org/apache/jasper/compiler/JspUtil.java       |  2 +-
 java/org/apache/jasper/compiler/Node.java          |  2 +-
 java/org/apache/jasper/compiler/PageInfo.java      |  6 +-
 .../apache/jasper/compiler/ParserController.java   |  2 +-
 java/org/apache/jasper/compiler/SmapUtil.java      |  2 +-
 java/org/apache/jasper/compiler/Validator.java     |  4 +-
 .../compiler/tagplugin/TagPluginContext.java       |  2 +-
 .../jasper/resources/LocalStrings.properties       |  4 +-
 .../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/juli/OneLineFormatter.java         |  4 +-
 java/org/apache/naming/factory/FactoryBase.java    |  2 +-
 java/org/apache/tomcat/buildutil/SignCode.java     |  2 +-
 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 +-
 .../tomcat/util/descriptor/web/ContextHandler.java |  2 +-
 .../util/descriptor/web/SecurityConstraint.java    |  2 +-
 .../apache/tomcat/util/descriptor/web/WebXml.java  |  6 +-
 java/org/apache/tomcat/util/digester/package.html  | 16 ++---
 .../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 +-
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 10 +---
 .../apache/tomcat/util/net/LocalStrings.properties |  3 +-
 java/org/apache/tomcat/util/net/Nio2Endpoint.java  |  2 +-
 java/org/apache/tomcat/util/net/NioEndpoint.java   |  2 +-
 .../apache/tomcat/util/net/SecureNio2Channel.java  |  6 +-
 .../util/net/openssl/LocalStrings.properties       |  2 +-
 .../tomcat/util/net/openssl/OpenSSLContext.java    | 10 ++--
 .../util/net/openssl/OpenSSLImplementation.java    |  2 +-
 .../tomcat/websocket/LocalStrings.properties       |  2 +-
 .../tomcat/websocket/WsRemoteEndpointImplBase.java |  4 +-
 .../tomcat/websocket/pojo/LocalStrings.properties  |  4 +-
 .../tomcat/websocket/server/WsFrameServer.java     |  5 +-
 modules/jdbc-pool/build.properties.default         |  2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                |  6 +-
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    | 17 +++++-
 .../apache/tomcat/jdbc/pool/DataSourceFactory.java |  2 +-
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   | 13 +++++
 .../apache/tomcat/jdbc/pool/JdbcInterceptor.java   |  2 +-
 .../apache/tomcat/jdbc/pool/PoolConfiguration.java |  4 +-
 .../jdbc/pool/interceptor/AbstractQueryReport.java |  2 +-
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |  2 +-
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       | 10 +++-
 .../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java  |  5 ++
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |  5 ++
 res/findbugs/filter-false-positives.xml            |  2 +-
 .../eclipse/java-compiler-errors-warnings.txt      |  2 +-
 res/ide-support/netbeans/README.txt                |  2 +-
 res/maven/mvn.properties.default                   |  2 +-
 .../catalina/connector/TestCoyoteAdapter.java      |  8 +--
 .../org/apache/catalina/connector/TestRequest.java |  4 +-
 .../apache/catalina/filters/TestCorsFilter.java    |  2 +-
 .../catalina/filters/TestRemoteIpFilter.java       |  2 +-
 .../webresources/TestJarInputStreamWrapper.java    |  2 +-
 .../coyote/ajp/TestAbstractAjpProcessor.java       |  2 +-
 .../http11/filters/TestGzipOutputFilter.java       |  2 +-
 .../apache/coyote/http2/TestHttp2Section_6_5.java  |  2 +-
 test/org/apache/el/TestELEvaluation.java           |  2 +-
 test/org/apache/el/lang/TestELSupport.java         |  4 +-
 .../util/descriptor/tld/TestImplicitTldParser.java |  4 +-
 .../tomcat/util/http/parser/TestMediaType.java     |  2 +-
 .../org/apache/tomcat/util/net/TestClientCert.java |  6 +-
 .../tomcat/websocket/TestWsWebSocketContainer.java | 20 +++----
 webapps/docs/changelog.xml                         | 68 ++++++++++++++++++++--
 webapps/docs/cluster-howto.xml                     |  2 +-
 webapps/docs/config/cluster-valve.xml              |  2 +-
 webapps/docs/config/credentialhandler.xml          |  4 +-
 webapps/docs/config/filter.xml                     |  2 +-
 webapps/docs/config/http.xml                       |  2 +-
 webapps/docs/config/http2.xml                      |  6 +-
 webapps/docs/config/listeners.xml                  | 14 ++++-
 webapps/docs/config/loader.xml                     |  2 +-
 webapps/docs/funcspecs/mbean-names.xml             |  2 +-
 webapps/docs/jndi-datasource-examples-howto.xml    |  4 +-
 webapps/docs/jndi-resources-howto.xml              |  2 +-
 webapps/docs/monitoring.xml                        |  8 +--
 webapps/docs/security-manager-howto.xml            |  2 +-
 webapps/docs/ssl-howto.xml                         |  2 +-
 .../compressionFilters/CompressionFilter.java      |  2 +-
 .../websocket/drawboard/DrawboardEndpoint.java     |  2 +-
 .../WEB-INF/classes/websocket/drawboard/Room.java  | 10 ++--
 webapps/examples/websocket/drawboard.xhtml         |  2 +-
 webapps/host-manager/WEB-INF/jsp/403.jsp           |  2 +-
 webapps/manager/WEB-INF/jsp/403.jsp                |  2 +-
 202 files changed, 529 insertions(+), 341 deletions(-)

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



More information about the pkg-java-commits mailing list