[tomcat8] 03/08: Merge tag 'upstream/8.0.36'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jun 14 13:31:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 6f705d5b868e92eee30348a608c251af62c6b2ba
Merge: 3bc6c25 9cbeed3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 14 14:00:55 2016 +0200
Merge tag 'upstream/8.0.36'
Upstream version 8.0.36
BUILDING.txt | 25 +-
bin/catalina.bat | 9 +
bin/catalina.sh | 32 +-
build.properties.default | 10 +-
build.xml | 16 +-
conf/catalina.properties | 3 +-
java/javax/servlet/ServletRequest.java | 9 +-
java/org/apache/catalina/Globals.java | 8 +
.../catalina/authenticator/SingleSignOnEntry.java | 3 +-
.../apache/catalina/connector/CoyoteAdapter.java | 20 +-
.../catalina/connector/LocalStrings.properties | 1 +
.../apache/catalina/connector/OutputBuffer.java | 9 +-
java/org/apache/catalina/connector/Request.java | 11 +-
.../apache/catalina/core/ApplicationContext.java | 19 +-
.../catalina/core/ApplicationDispatcher.java | 2 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 31 +-
.../apache/catalina/core/AsyncListenerWrapper.java | 30 +-
java/org/apache/catalina/core/ContainerBase.java | 15 +-
.../core/JreMemoryLeakPreventionListener.java | 56 +-
java/org/apache/catalina/core/StandardContext.java | 58 +-
.../apache/catalina/core/StandardHostValve.java | 9 +-
.../apache/catalina/core/StandardWrapperValve.java | 4 +-
.../apache/catalina/core/mbeans-descriptors.xml | 6 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 2 +-
.../catalina/ha/context/ReplicatedContext.java | 3 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 9 +-
.../apache/catalina/loader/LocalStrings.properties | 2 +
.../catalina/loader/WebappClassLoaderBase.java | 62 +-
java/org/apache/catalina/mapper/Mapper.java | 4 +-
.../catalina/security/SecurityClassLoad.java | 3 +
.../catalina/session/PersistentManagerBase.java | 50 +-
.../apache/catalina/session/StandardSession.java | 3 +-
.../org/apache/catalina/startup/ContextConfig.java | 12 +-
.../catalina/startup/LocalStrings.properties | 2 +-
.../catalina/startup/LocalStrings_es.properties | 2 +-
.../catalina/storeconfig/server-registry.xml | 2 +
.../catalina/tribes/group/ChannelCoordinator.java | 32 +-
.../tribes/group/ChannelInterceptorBase.java | 18 +
.../apache/catalina/tribes/group/GroupChannel.java | 24 +-
.../interceptors/MessageDispatchInterceptor.java | 8 +-
.../interceptors/StaticMembershipInterceptor.java | 2 +
.../group/interceptors/TcpPingInterceptor.java | 8 +-
.../catalina/tribes/membership/McastService.java | 20 +-
.../tribes/membership/McastServiceImpl.java | 31 +-
.../catalina/tribes/membership/MemberImpl.java | 15 +-
.../tribes/membership/mbeans-descriptors.xml | 12 +
.../tribes/tipis/AbstractReplicatedMap.java | 62 +-
.../catalina/tribes/tipis/LocalStrings.properties | 2 +
.../catalina/tribes/transport/ReceiverBase.java | 22 +-
.../tribes/transport/ReplicationTransmitter.java | 13 +
.../catalina/tribes/transport/bio/BioReceiver.java | 8 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 8 +-
.../apache/catalina/util/LocalStrings.properties | 2 +-
.../apache/catalina/valves/ErrorReportValve.java | 3 +-
.../catalina/valves/StuckThreadDetectionValve.java | 8 +-
java/org/apache/coyote/AbstractProtocol.java | 18 +-
java/org/apache/coyote/ActionCode.java | 6 +
java/org/apache/coyote/AsyncStateMachine.java | 45 +-
java/org/apache/coyote/Response.java | 12 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 5 +
.../coyote/http11/AbstractHttp11Processor.java | 11 +-
.../coyote/http11/AbstractNioInputBuffer.java | 13 +-
.../apache/coyote/http11/Http11Nio2Protocol.java | 4 +-
.../apache/coyote/http11/Http11NioProtocol.java | 4 +-
.../coyote/http11/InternalAprInputBuffer.java | 14 +-
.../apache/coyote/http11/InternalInputBuffer.java | 17 +-
.../apache/coyote/http11/LocalStrings.properties | 2 +-
.../http11/upgrade/Nio2ServletInputStream.java | 8 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 6 +-
java/org/apache/el/parser/ELParser.java | 11 +-
java/org/apache/jasper/JspCompilationContext.java | 2 +-
java/org/apache/jasper/compiler/Compiler.java | 2 +-
.../apache/jasper/compiler/JavacErrorDetail.java | 2 +-
.../apache/jasper/compiler/JspDocumentParser.java | 2 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 3 +-
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
java/org/apache/jasper/compiler/Parser.java | 2 +-
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 15 +-
java/org/apache/jasper/compiler/TldCache.java | 5 +-
.../jasper/resources/LocalStrings.properties | 2 +
.../apache/jasper/servlet/JspCServletContext.java | 6 +-
.../apache/jasper/servlet/JspServletWrapper.java | 2 +-
java/org/apache/jasper/servlet/TldScanner.java | 71 ++-
.../jasper/xmlparser/XMLEncodingDetector.java | 2 +-
java/org/apache/tomcat/{util/scan => }/Jar.java | 38 +-
java/org/apache/tomcat/JarScannerCallback.java | 34 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 22 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 251 ++++----
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 44 +-
.../dbcp/dbcp2/DataSourceConnectionFactory.java | 4 +-
.../dbcp/dbcp2/DelegatingCallableStatement.java | 452 ++++++-------
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 248 ++++----
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 458 +++++++-------
.../dbcp/dbcp2/DelegatingPreparedStatement.java | 212 +++----
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 700 ++++++++++-----------
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 136 ++--
.../tomcat/dbcp/dbcp2/DriverConnectionFactory.java | 2 +-
.../dbcp/dbcp2/DriverManagerConnectionFactory.java | 15 +-
.../dbcp/dbcp2/LifetimeExceededException.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 20 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 18 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 40 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 81 +--
.../dbcp/dbcp2/PoolablePreparedStatement.java | 20 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 95 +--
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 33 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 51 +-
.../dbcp/dbcp2/SwallowedExceptionLogger.java | 6 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 20 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 46 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 88 +--
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 20 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 108 ++--
.../dbcp/dbcp2/cpdsadapter/package-info.java | 2 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 72 +--
.../dbcp2/datasources/InstanceKeyDataSource.java | 110 ++--
.../datasources/InstanceKeyDataSourceFactory.java | 34 +-
.../datasources/KeyedCPDSConnectionFactory.java | 78 +--
.../dbcp2/datasources/PerUserPoolDataSource.java | 182 +++---
.../datasources/PerUserPoolDataSourceFactory.java | 18 +-
.../tomcat/dbcp/dbcp2/datasources/PoolKey.java | 8 +-
.../dbcp2/datasources/PooledConnectionAndInfo.java | 2 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 36 +-
.../datasources/SharedPoolDataSourceFactory.java | 8 +-
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 8 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 12 +-
.../pool2/{UsageTracking.java => BaseObject.java} | 32 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 8 +-
.../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 10 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 84 +--
.../apache/tomcat/dbcp/pool2/UsageTracking.java | 2 +-
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java | 34 +-
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 204 ++++--
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 72 ++-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 4 +-
.../dbcp/pool2/impl/DefaultPooledObject.java | 26 +-
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 25 +-
.../tomcat/dbcp/pool2/impl/EvictionConfig.java | 21 +-
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 35 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 471 ++++++++------
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 23 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 266 ++++----
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 19 +-
.../pool2/impl/InterruptibleReentrantLock.java | 8 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 176 +++---
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 32 +-
.../dbcp/pool2/impl/PooledSoftReference.java | 6 +-
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 68 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 4 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 1 +
java/org/apache/tomcat/util/compat/Jre8Compat.java | 95 +++
java/org/apache/tomcat/util/compat/Jre9Compat.java | 50 ++
java/org/apache/tomcat/util/compat/JreCompat.java | 105 ++++
.../tomcat/util/compat/LocalStrings.properties | 16 +
.../util/descriptor/tld/TldResourcePath.java | 2 +-
.../descriptor/web/FragmentJarScannerCallback.java | 25 +-
.../apache/tomcat/util/file/ConfigFileLoader.java | 30 +-
.../tomcat/util/file/LocalStrings.properties | 16 +
.../tomcat/util/http/FastHttpDateFormat.java | 7 +-
.../tomcat/util/http/LegacyCookieProcessor.java | 8 +-
java/org/apache/tomcat/util/http/RequestUtil.java | 16 +-
java/org/apache/tomcat/util/http/ServerCookie.java | 1 -
.../util/http/fileupload/MultipartStream.java | 12 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 51 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 8 +
java/org/apache/tomcat/util/net/JIoEndpoint.java | 6 +
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 56 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 40 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 32 +-
.../util/net/jsse/res/LocalStrings.properties | 1 -
.../tomcat/util/net/res/LocalStrings.properties | 1 -
.../{UrlJar.java => AbstractInputStreamJar.java} | 144 +++--
java/org/apache/tomcat/util/scan/Constants.java | 1 +
java/org/apache/tomcat/util/scan/Jar.java | 94 +--
java/org/apache/tomcat/util/scan/JarFactory.java | 2 +
.../org/apache/tomcat/util/scan/JarFileUrlJar.java | 9 +
.../tomcat/util/scan/JarFileUrlNestedJar.java | 141 +----
.../tomcat/util/scan/StandardJarScanner.java | 226 ++++---
java/org/apache/tomcat/util/scan/UrlJar.java | 119 +---
.../tomcat/websocket/BackgroundProcessManager.java | 21 +
java/org/apache/tomcat/websocket/WsSession.java | 10 +-
.../websocket/server/WsHttpUpgradeHandler.java | 5 -
.../tomcat/websocket/server/WsServerContainer.java | 25 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 19 +-
res/ide-support/eclipse/eclipse.classpath | 1 +
res/maven/mvn.properties.default | 2 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 274 ++++++++
.../loader/TestWebappClassLoaderWeaving.java | 1 +
.../apache/catalina/mapper/TestMapperListener.java | 4 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 4 +-
.../catalina/session/TestPersistentManager.java | 296 +--------
....java => TestPersistentManagerIntegration.java} | 76 +--
test/org/apache/catalina/session/TesterStore.java | 90 +++
test/org/apache/catalina/startup/TestTomcat.java | 2 +-
.../webresources/AbstractTestFileResourceSet.java | 12 +-
.../webresources/AbstractTestResourceSet.java | 24 +-
.../catalina/webresources/TestDirResourceSet.java | 15 +
.../webresources/TestDirResourceSetInternal.java | 15 +
.../webresources/TestDirResourceSetMount.java | 15 +
.../webresources/TestDirResourceSetReadOnly.java | 15 +
.../webresources/TestDirResourceSetVirtual.java | 15 +
.../catalina/webresources/TestFileResourceSet.java | 25 +-
.../webresources/TestFileResourceSetReadOnly.java | 47 +-
.../webresources/TestFileResourceSetVirtual.java | 27 +-
.../catalina/webresources/TestJarResourceSet.java | 15 +
.../webresources/TestJarResourceSetInternal.java | 15 +
.../webresources/TestJarResourceSetMount.java | 15 +
.../coyote/http11/TestAbstractHttp11Processor.java | 146 ++++-
.../coyote/http11/TestInternalInputBuffer.java | 57 ++
test/org/apache/jasper/servlet/TestTldScanner.java | 9 +-
test/org/apache/tomcat/unittest/TesterContext.java | 10 +-
test/org/apache/tomcat/unittest/TesterHost.java | 372 +++++++++++
.../tomcat/unittest/TesterServletContext.java | 2 +-
.../apache/tomcat/util/bcel/TesterPerformance.java | 2 +-
.../util/http/TestCookieProcessorGeneration.java | 5 +-
.../apache/tomcat/util/http/TestRequestUtil.java | 40 ++
test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 +-
test/org/apache/tomcat/util/net/TestSsl.java | 4 +-
.../tomcat/util/scan/TestStandardJarScanner.java | 15 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 6 +-
.../websocket/TestWebSocketFrameClientSSL.java | 6 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 3 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 3 +-
.../tomcat/websocket/TestWsSubprotocols.java | 3 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 60 +-
.../apache/tomcat/websocket/WebSocketBaseTest.java | 51 ++
.../apache/tomcat/websocket/server/TestClose.java | 4 +-
...stCloseBug58264.java => TestCloseBug58624.java} | 46 +-
.../server/TestWsRemoteEndpointImplServer.java | 4 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
webapps/docs/changelog.xml | 421 ++++++++++++-
webapps/docs/config/ajp.xml | 28 +-
webapps/docs/config/cluster-interceptor.xml | 106 ++--
webapps/docs/config/context.xml | 20 +-
webapps/docs/config/filter.xml | 2 +-
webapps/docs/config/http.xml | 34 +-
webapps/docs/config/listeners.xml | 10 +-
webapps/docs/config/manager.xml | 24 +-
webapps/docs/logging.xml | 2 +-
webapps/docs/maven-jars.xml | 4 +-
webapps/docs/ssl-howto.xml | 97 +--
244 files changed, 6521 insertions(+), 4085 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