[tomcat8] 01/03: Merge tag 'upstream/8.0.24'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 8 17:10:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 72ba0cc49caa4f15e39cdfb89caa4622938fa627
Merge: b4d6642 60af523
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 8 17:38:48 2015 +0200
Merge tag 'upstream/8.0.24'
Upstream version 8.0.24
LICENSE | 2 +-
NOTICE | 8 +-
build.properties.default | 4 +-
build.xml | 6 +-
java/javax/servlet/MultipartConfigElement.java | 8 +-
java/org/apache/catalina/ant/DeployTask.java | 2 +-
.../org/apache/catalina/connector/InputBuffer.java | 4 +
java/org/apache/catalina/connector/Request.java | 6 +-
java/org/apache/catalina/core/ContainerBase.java | 19 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../apache/catalina/filters/RemoteIpFilter.java | 5 +-
.../catalina/loader/WebappClassLoaderBase.java | 97 +-
.../apache/catalina/storeconfig/StoreRegistry.java | 4 +-
.../catalina/storeconfig/server-registry.xml | 2 +-
.../catalina/tribes/group/ChannelCoordinator.java | 11 +-
.../apache/catalina/tribes/group/GroupChannel.java | 21 +-
.../catalina/tribes/group/LocalStrings.properties | 26 +
.../apache/catalina/tribes/group/RpcChannel.java | 5 +-
.../interceptors/DomainFilterInterceptor.java | 7 +-
.../interceptors/FragmentationInterceptor.java | 10 +-
.../tribes/group/interceptors/GzipInterceptor.java | 7 +-
.../group/interceptors/LocalStrings.properties | 58 +
.../interceptors/MessageDispatchInterceptor.java | 19 +-
.../group/interceptors/NonBlockingCoordinator.java | 15 +-
.../group/interceptors/OrderInterceptor.java | 5 +-
.../group/interceptors/TcpFailureDetector.java | 25 +-
.../group/interceptors/TcpPingInterceptor.java | 7 +-
.../group/interceptors/ThroughputInterceptor.java | 27 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 11 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 8 +-
.../tribes/{util => io}/LocalStrings.properties | 10 +-
.../apache/catalina/tribes/io/ObjectReader.java | 5 +-
.../catalina/tribes/io/ReplicationStream.java | 6 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 23 +-
.../tribes/membership/LocalStrings.properties | 32 +
.../catalina/tribes/membership/McastService.java | 8 +-
.../tribes/membership/McastServiceImpl.java | 53 +-
.../catalina/tribes/membership/MemberImpl.java | 14 +-
.../catalina/tribes/membership/StaticMember.java | 2 +-
.../tribes/tipis/AbstractReplicatedMap.java | 62 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 14 +-
.../catalina/tribes/tipis/LocalStrings.properties | 44 +
.../catalina/tribes/tipis/ReplicatedMap.java | 44 +-
.../tribes/transport/LocalStrings.properties | 26 +-
.../tribes/transport/LocalStrings_es.properties | 16 +-
.../catalina/tribes/transport/PooledSender.java | 5 +-
.../catalina/tribes/transport/ReceiverBase.java | 14 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 16 +-
.../tribes/transport/bio/BioReplicationTask.java | 19 +-
.../catalina/tribes/transport/bio/BioSender.java | 21 +-
.../tribes/transport/bio/LocalStrings.properties | 37 +
.../tribes/transport/bio/PooledMultiSender.java | 8 +-
.../tribes/transport/bio/util/FastQueue.java | 22 +-
.../transport/bio/util}/LocalStrings.properties | 13 +-
.../tribes/transport/nio/LocalStrings.properties | 53 +
.../catalina/tribes/transport/nio/NioReceiver.java | 23 +-
.../tribes/transport/nio/NioReplicationTask.java | 19 +-
.../catalina/tribes/transport/nio/NioSender.java | 28 +-
.../tribes/transport/nio/ParallelNioSender.java | 31 +-
.../tribes/transport/nio/PooledParallelSender.java | 13 +-
java/org/apache/catalina/tribes/util/Arrays.java | 9 +-
.../catalina/tribes/util/ExecutorFactory.java | 5 +-
.../catalina/tribes/util/LocalStrings.properties | 7 +
.../apache/catalina/tribes/util/UUIDGenerator.java | 6 +-
.../apache/catalina/valves/PersistentValve.java | 153 +-
java/org/apache/coyote/Response.java | 6 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 200 +-
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 185 +-
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 21 +
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 2 +-
...nLogger.java => LifetimeExceededException.java} | 29 +-
.../tomcat/dbcp/dbcp2/LocalStrings.properties | 10 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 95 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 70 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 19 +-
.../dbcp/dbcp2/SwallowedExceptionLogger.java | 27 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 29 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 2 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 35 +-
.../datasources/KeyedCPDSConnectionFactory.java | 4 +-
.../dbcp2/datasources/PooledConnectionManager.java | 2 +-
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 112 +-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 50 +-
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 2 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 65 +-
java/org/apache/tomcat/jni/SSL.java | 8 +
java/org/apache/tomcat/util/bcel/Constants.java | 7 +-
.../util/bcel/classfile/AnnotationEntry.java | 10 +-
.../tomcat/util/bcel/classfile/Annotations.java | 9 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 47 +-
.../tomcat/util/bcel/classfile/Constant.java | 22 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 4 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 4 +-
.../tomcat/util/bcel/classfile/ElementValue.java | 128 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 2 +-
.../apache/tomcat/util/bcel/classfile/Utility.java | 2 -
java/org/apache/tomcat/util/bcel/package.html | 2 +-
.../apache/tomcat/util/codec/DecoderException.java | 6 +-
.../apache/tomcat/util/codec/EncoderException.java | 6 +-
.../apache/tomcat/util/codec/binary/Base64.java | 45 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 15 +-
.../tomcat/util/codec/binary/StringUtils.java | 13 +-
.../util/http/fileupload/FileUploadBase.java | 4 +-
.../util/http/fileupload/ParameterParser.java | 22 +-
.../util/http/fileupload/disk/DiskFileItem.java | 12 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 84 +-
java/org/apache/tomcat/util/net/Constants.java | 11 +
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 2 +-
java/org/apache/tomcat/util/net/NioChannel.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 104 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 2 +-
.../tomcat/util/net/jsse/openssl/Cipher.java | 485 +-
.../openssl/OpenSSLCipherConfigurationParser.java | 29 +-
.../tomcat/util/net/jsse/openssl/Protocol.java | 10 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
.../tomcat/websocket/WsWebSocketContainer.java | 16 +-
.../tomcat/websocket/server/UpgradeUtil.java | 3 +
.../tomcat/websocket/server/WsServerContainer.java | 7 -
modules/jdbc-pool/doc/jdbc-pool.xml | 18 +-
.../jdbc/pool/interceptor/SlowQueryReport.java | 78 +-
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 4 +-
res/INSTALLLICENSE | 2 +-
res/maven/mvn.properties.default | 2 +-
.../catalina/connector/TestCoyoteOutputStream.java | 76 +-
.../org/apache/catalina/connector/TestRequest.java | 5 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 10 +
.../tomcat/util/net/jsse/openssl/TestCipher.java | 8 +-
.../util/net/jsse/openssl/TesterOpenSSL.java | 11 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 32 +-
webapps/docs/architecture/requestProcess.xml | 9 +-
.../requestProcess/authentication-process.png | Bin 0 -> 42682 bytes
.../requestProcess/request-process.png | Bin 0 -> 109471 bytes
.../architecture/requestProcess/requestProcess.pdf | Bin 32424 -> 0 bytes
.../docs/architecture/requestProcess/roseModel.mdl | 12921 -------------------
.../docs/architecture/startup/serverStartup.txt | 25 +-
webapps/docs/changelog.xml | 218 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-membership.xml | 3 +-
webapps/docs/config/http.xml | 34 +-
webapps/docs/rewrite.xml | 4 +
webapps/docs/ssl-howto.xml | 18 +
150 files changed, 2812 insertions(+), 14076 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