[tomcat8] 01/03: Merge tag 'upstream/8.0.26'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Aug 24 22:56:26 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 a3a77c87ce4c3b53a727813a035da8de22c6deda
Merge: 718c39f 4ede89d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Aug 24 00:21:06 2015 +0200
Merge tag 'upstream/8.0.26'
Upstream version 8.0.26
BUILDING.txt | 8 +-
build.properties.default | 10 +-
build.xml | 41 +-
conf/catalina.properties | 2 +-
conf/web.xml | 11 +-
java/org/apache/catalina/Globals.java | 7 +
.../apache/catalina/ant/AbstractCatalinaTask.java | 2 +-
java/org/apache/catalina/ant/DeployTask.java | 40 +-
java/org/apache/catalina/ant/ValidatorTask.java | 8 +-
java/org/apache/catalina/connector/Request.java | 42 +-
.../apache/catalina/core/ApplicationContext.java | 54 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 123 +-
.../catalina/filters/FailedRequestFilter.java | 38 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 13 +-
.../catalina/loader/WebappClassLoaderBase.java | 33 +-
.../org/apache/catalina/security/SecurityUtil.java | 22 +-
java/org/apache/catalina/servlets/CGIServlet.java | 72 +-
java/org/apache/catalina/startup/HostConfig.java | 2 +-
.../catalina/tribes/group/ChannelCoordinator.java | 3 +-
.../interceptors/MessageDispatchInterceptor.java | 2 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 3 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 3 +-
.../catalina/tribes/membership/McastService.java | 4 +-
.../tribes/membership/McastServiceImpl.java | 24 +-
.../tribes/tipis/AbstractReplicatedMap.java | 6 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 3 +-
.../tribes/transport/bio/PooledMultiSender.java | 3 +-
.../tribes/transport/bio/util/FastQueue.java | 7 +-
.../catalina/tribes/transport/nio/NioSender.java | 4 +-
.../tribes/transport/nio/ParallelNioSender.java | 13 +-
.../tribes/transport/nio/PooledParallelSender.java | 4 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 4 +-
.../catalina/valves/AbstractAccessLogValve.java | 3 +-
.../webresources/AbstractArchiveResourceSet.java | 11 +-
.../catalina/webresources/AbstractResourceSet.java | 11 +
java/org/apache/catalina/webresources/Cache.java | 4 +-
.../catalina/webresources/DirResourceSet.java | 26 +-
.../apache/catalina/webresources/FileResource.java | 12 +-
.../catalina/webresources/FileResourceSet.java | 2 +-
.../catalina/webresources/LocalStrings.properties | 1 +
java/org/apache/coyote/AbstractProtocol.java | 5 +
java/org/apache/coyote/AsyncStateMachine.java | 39 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 9 +-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 4 +
.../coyote/http11/AbstractHttp11Processor.java | 2 +-
.../coyote/http11/AbstractHttp11Protocol.java | 2 +-
.../apache/coyote/http11/Http11NioProtocol.java | 4 +
java/org/apache/jasper/JspC.java | 113 +-
.../apache/jasper/compiler/ErrorDispatcher.java | 3 +-
java/org/apache/jasper/compiler/Generator.java | 9 +-
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
java/org/apache/jasper/el/ELContextImpl.java | 2 +-
.../apache/jasper/runtime/JspContextWrapper.java | 172 ++-
.../org/apache/jasper/runtime/PageContextImpl.java | 11 +-
.../apache/tomcat/InstrumentableClassLoader.java | 4 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 4 +-
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 7 +
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 10 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 9 +-
.../datasources/KeyedCPDSConnectionFactory.java | 9 +-
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 2 +-
.../dbcp/pool2/impl/DefaultPooledObject.java | 6 +
java/org/apache/tomcat/jni/Socket.java | 11 +-
java/org/apache/tomcat/util/http/Parameters.java | 46 +-
java/org/apache/tomcat/util/http/RequestUtil.java | 45 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 4 +
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 72 +-
.../apache/tomcat/util/net/NioSelectorPool.java | 1 -
.../util/net/jsse/openssl/Authentication.java | 2 +-
.../tomcat/util/net/jsse/openssl/Cipher.java | 1587 ++++++++++++++++----
.../tomcat/util/net/jsse/openssl/Encryption.java | 16 +-
.../util/net/jsse/openssl/EncryptionLevel.java | 8 +-
.../tomcat/util/net/jsse/openssl/KeyExchange.java | 5 +-
.../util/net/jsse/openssl/MessageDigest.java | 8 +-
.../openssl/OpenSSLCipherConfigurationParser.java | 38 +-
java/org/apache/tomcat/websocket/Util.java | 8 +-
.../tomcat/websocket/WsWebSocketContainer.java | 4 +-
.../tomcat/websocket/pojo/PojoEndpointClient.java | 3 +-
.../tomcat/websocket/pojo/PojoMethodMapping.java | 7 +-
.../tomcat/websocket/server/WsServerContainer.java | 17 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 7 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 11 +-
.../pool/interceptor/QueryTimeoutInterceptor.java | 5 +-
.../jdbc/pool/interceptor/SlowQueryReport.java | 2 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 29 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
.../eclipse/java-compiler-errors-warnings.txt | 2 +-
res/maven/mvn.properties.default | 2 +-
test/deployment/context.jar | Bin 0 -> 489 bytes
test/deployment/dir with spaces/context.jar | Bin 0 -> 489 bytes
test/deployment/dir with spaces/context.war | Bin 0 -> 565 bytes
test/org/apache/catalina/ant/TestDeployTask.java | 118 ++
.../org/apache/catalina/connector/TestRequest.java | 6 +-
.../apache/catalina/startup/LoggingBaseTest.java | 21 +-
.../webresources/AbstractTestResourceSet.java | 19 +
.../webresources/TestFileResource.java} | 30 +-
.../jasper/runtime/TestJspContextWrapper.java | 69 +
.../apache/tomcat/util/http/TestRequestUtil.java | 70 +-
.../tomcat/util/net/jsse/openssl/TestCipher.java | 152 +-
.../TestOpenSSLCipherConfigurationParser.java | 182 ++-
.../TestOpenSSLCipherConfigurationParserOnly.java | 10 +
.../util/net/jsse/openssl/TesterOpenSSL.java | 295 +++-
.../websocket/server/TestWsServerContainer.java | 47 +
.../classes/org/apache/tomcat/Bug58096.class | Bin 0 -> 285 bytes
.../classes/org/apache/tomcat/Bug58096.java} | 21 +-
test/webapp/WEB-INF/tags/bug58178.tag | 32 +
test/webapp/WEB-INF/tags/bug58178b.tag | 20 +
test/webapp/bug5nnnn/bug58096.jsp | 17 +
test/webapp/bug5nnnn/bug58178.jsp | 30 +
test/webapp/bug5nnnn/bug58178b.jsp | 21 +
test/webresources/dir1/META-INF/MANIFEST.MF | 2 +
webapps/docs/building.xml | 6 +-
webapps/docs/cgi-howto.xml | 7 +-
webapps/docs/changelog.xml | 261 +++-
webapps/docs/cluster-howto.xml | 8 +-
webapps/docs/config/cluster-deployer.xml | 2 +-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/executor.xml | 2 +-
webapps/docs/config/filter.xml | 4 +-
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 9 +-
webapps/docs/config/listeners.xml | 6 +-
webapps/docs/config/manager.xml | 4 +-
webapps/docs/config/systemprops.xml | 5 +-
webapps/docs/config/valve.xml | 59 +-
webapps/docs/funcspecs/fs-default.xml | 2 +-
webapps/docs/funcspecs/fs-jdbc-realm.xml | 2 +-
webapps/docs/funcspecs/fs-jndi-realm.xml | 2 +-
webapps/docs/funcspecs/fs-memory-realm.xml | 2 +-
webapps/docs/index.xml | 2 +-
webapps/docs/jasper-howto.xml | 4 +-
webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 8 +-
webapps/docs/logging.xml | 4 +-
webapps/docs/manager-howto.xml | 36 +-
webapps/docs/monitoring.xml | 8 +-
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/security-howto.xml | 2 +-
webapps/docs/ssi-howto.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 +-
webapps/docs/tribes/introduction.xml | 2 +-
143 files changed, 3756 insertions(+), 921 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