[tomcat8] branch master updated (0646410 -> c45d26c)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Feb 16 13:48:59 UTC 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat8.
from 0646410 Removed the setDefaultAsyncSendTimeout method mistakenly added to WebSocketContainer in the version 8.5.24 (Closes: #884046)
new d664b16 Standards-Version updated to 4.1.3
new 6eec40d Switch to debhelper level 11
adds b24652d New upstream version 8.5.27
new 2436362 Update upstream source from tag 'upstream/8.5.27'
new 4d21c96 Refreshed the patches
adds 445bf8e New upstream version 8.5.28
new 7a07bf5 Update upstream source from tag 'upstream/8.5.28'
new 0010667 Disabled the tests checking the ARIA cipher since it isn't enabled by default in OpenSSL
new bd2d58a Use a secure URL for checking and downloading the new releases
new 3bae130 No longer parse dpkg-parsechangelog in debian/rules
new c45d26c Upload to unstable
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
MERGE.txt | 32 +-
NOTICE | 2 +-
build.properties.default | 6 +-
build.xml | 45 +-
debian/changelog | 15 +-
debian/compat | 2 +-
debian/control | 4 +-
debian/orig-tar.sh | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 6 +-
debian/patches/0005-skip-test-failures.patch | 2 +-
debian/patches/0010-debianize-build-xml.patch | 17 +-
.../0021-dont-test-unsupported-ciphers.patch | 19 +-
.../patches/0022-websocket-api-compatibility.patch | 61 ---
debian/patches/series | 1 -
debian/rules | 14 +-
debian/watch | 2 +-
java/javax/el/Util.java | 83 +--
java/javax/websocket/WebSocketContainer.java | 11 -
java/org/apache/catalina/Wrapper.java | 18 +-
.../catalina/authenticator/AuthenticatorBase.java | 8 -
.../catalina/authenticator/FormAuthenticator.java | 27 +-
.../authenticator/NonLoginAuthenticator.java | 6 +-
.../apache/catalina/core/ApplicationContext.java | 28 +-
.../core/ApplicationServletRegistration.java | 7 +
.../org/apache/catalina/core/AsyncContextImpl.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 30 +-
java/org/apache/catalina/core/StandardWrapper.java | 43 +-
.../core/ThreadLocalLeakPreventionListener.java | 6 +-
.../catalina/filters/AddDefaultCharsetFilter.java | 18 +
java/org/apache/catalina/manager/Constants.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 84 ++-
.../catalina/manager/LocalStrings.properties | 14 +-
.../apache/catalina/manager/ManagerServlet.java | 120 ++++-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../realm/DigestCredentialHandlerBase.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 7 +-
.../catalina/security/SecurityClassLoad.java | 257 +++-------
.../org/apache/catalina/security/SecurityUtil.java | 4 +-
java/org/apache/catalina/startup/Catalina.java | 11 +
.../org/apache/catalina/startup/ContextConfig.java | 9 +-
java/org/apache/catalina/startup/Tomcat.java | 18 +-
.../apache/catalina/startup/WebAnnotationSet.java | 118 ++---
.../{SSLHostConfigSF.java => OpenSSLConfSF.java} | 24 +-
java/org/apache/catalina/util/SessionConfig.java | 2 +-
.../util/SystemPropertyReplacerListener.java | 2 +
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AsyncStateMachine.java | 1 +
java/org/apache/coyote/CompressionConfig.java | 274 ++++++++++
.../coyote/http11/AbstractHttp11Protocol.java | 55 +-
.../apache/coyote/http11/Http11OutputBuffer.java | 83 ++-
java/org/apache/coyote/http11/Http11Processor.java | 4 +-
.../HttpOutputBuffer.java} | 40 +-
java/org/apache/coyote/http11/OutputFilter.java | 23 +-
.../coyote/http11/filters/ChunkedOutputFilter.java | 34 +-
.../coyote/http11/filters/GzipOutputFilter.java | 31 +-
.../http11/filters/IdentityOutputFilter.java | 37 +-
.../coyote/http11/filters/VoidOutputFilter.java | 43 +-
.../http11/upgrade/UpgradeServletInputStream.java | 8 +-
java/org/apache/coyote/http2/AbstractStream.java | 1 +
.../org/apache/coyote/http2/Http2OutputBuffer.java | 87 ++++
java/org/apache/coyote/http2/Http2Protocol.java | 51 ++
.../apache/coyote/http2/Http2UpgradeHandler.java | 148 ++----
.../apache/coyote/http2/LocalStrings.properties | 1 -
java/org/apache/coyote/http2/Stream.java | 112 ++--
java/org/apache/coyote/http2/StreamProcessor.java | 51 +-
java/org/apache/el/parser/AstValue.java | 9 +-
java/org/apache/el/util/ReflectionUtil.java | 55 +-
java/org/apache/jasper/compiler/ELParser.java | 8 +-
.../org/apache/jasper/runtime/BodyContentImpl.java | 13 +-
.../apache/jasper/security/SecurityClassLoad.java | 94 ++--
java/org/apache/juli/ClassLoaderLogManager.java | 24 +-
java/org/apache/naming/NamingContext.java | 8 +-
java/org/apache/tomcat/SimpleInstanceManager.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 89 +++-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 267 +++++++++-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 9 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 7 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 217 ++++++--
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 4 +
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +-
.../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 2 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 11 +-
.../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 3 +
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 4 +-
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 +-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 23 +
.../org/apache/tomcat/dbcp/pool2/PooledObject.java | 16 +-
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java | 37 ++
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 33 +-
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 50 +-
.../apache/tomcat/dbcp/pool2/impl/CallStack.java | 52 ++
.../tomcat/dbcp/pool2/impl/CallStackUtils.java | 89 ++++
.../dbcp/pool2/impl/DefaultPooledObject.java | 77 +--
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 2 +-
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 164 +++---
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 51 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 23 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 6 +-
.../dbcp/pool2/impl/NoOpCallStack.java} | 31 +-
.../dbcp/pool2/impl/SecurityManagerCallStack.java | 129 +++++
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +-
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 86 ++++
java/org/apache/tomcat/util/bcel/Const.java | 104 ++--
java/org/apache/tomcat/util/buf/AbstractChunk.java | 181 +++++++
java/org/apache/tomcat/util/buf/ByteChunk.java | 518 ++++++++-----------
java/org/apache/tomcat/util/buf/CharChunk.java | 565 +++++++++------------
java/org/apache/tomcat/util/buf/UriUtil.java | 3 +-
.../apache/tomcat/util/codec/binary/Base64.java | 4 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 6 +-
.../tomcat/util/codec/binary/StringUtils.java | 18 +-
.../tomcat/util/descriptor/LocalResolver.java | 2 +-
java/org/apache/tomcat/util/digester/Digester.java | 3 +
.../http/fileupload/ByteArrayOutputStream.java | 52 +-
.../http/fileupload/DeferredFileOutputStream.java | 34 +-
.../tomcat/util/http/fileupload/FileUtils.java | 113 ++++-
.../tomcat/util/http/fileupload/IOUtils.java | 47 +-
.../util/http/fileupload/MultipartStream.java | 6 +-
.../http/fileupload/ThresholdingOutputStream.java | 28 +-
.../util/http/fileupload/disk/DiskFileItem.java | 29 +-
.../http/fileupload/disk/DiskFileItemFactory.java | 28 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 10 +-
.../tomcat/util/net/AbstractJsseEndpoint.java | 7 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 8 +-
.../apache/tomcat/util/net/LocalStrings.properties | 3 +
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 30 +-
.../tomcat/util/net/NioBlockingSelector.java | 159 +++---
java/org/apache/tomcat/util/net/SSLContext.java | 4 +
java/org/apache/tomcat/util/net/SSLHostConfig.java | 6 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 -
.../apache/tomcat/util/net/SecureNio2Channel.java | 16 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 6 +
.../tomcat/util/net/TLSClientHelloExtractor.java | 88 +++-
.../tomcat/util/net/jsse/JSSESSLContext.java | 40 ++
java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 6 +-
.../tomcat/util/net/jsse/LocalStrings.properties | 3 +-
.../tomcat/util/net/openssl/OpenSSLContext.java | 71 ++-
.../util/net/openssl/OpenSSLSessionContext.java | 31 +-
.../tomcat/util/net/openssl/ciphers/Cipher.java | 284 ++++++++++-
.../util/net/openssl/ciphers/Encryption.java | 2 +
.../ciphers/OpenSSLCipherConfigurationParser.java | 18 +-
.../tomcat/websocket/WsWebSocketContainer.java | 12 -
.../websocket/server/WsHttpUpgradeHandler.java | 9 +-
modules/jdbc-pool/NOTICE | 2 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 1 +
.../org/apache/tomcat/jdbc/pool/DataSource.java | 23 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 68 ++-
...ADataSource.java => PooledConnectionMBean.java} | 36 +-
.../jdbc/pool/interceptor/ResetAbandonedTimer.java | 47 +-
.../pool/interceptor/ResetAbandonedTimerMBean.java | 9 +-
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 23 +-
.../jdbc/pool/interceptor/StatementCache.java | 54 +-
...eportJmxMBean.java => StatementCacheMBean.java} | 11 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 40 +-
.../org/apache/tomcat/jdbc/pool/jmx/JmxUtil.java | 59 +++
res/findbugs/filter-false-positives.xml | 17 +-
res/maven/mvn.properties.default | 2 +-
test/javax/el/TestBeanELResolver.java | 481 ++++++++++++++++++
test/javax/el/TesterBean.java | 9 +
.../servlet/annotation/TestServletSecurity.java | 108 ++++
.../annotation/TestServletSecurityMappings.java | 247 +++++++++
.../apache/catalina/core/TestStandardContext.java | 50 ++
.../catalina/filters/TestAddCharSetFilter.java | 48 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 94 ++--
.../catalina/nonblocking/TestNonBlockingAPI.java | 234 ++++++++-
.../apache/catalina/startup/TomcatBaseTest.java | 34 +-
.../catalina/valves/rewrite/TestRewriteValve.java | 21 +-
.../coyote/http11/filters/TesterOutputBuffer.java | 15 +-
test/org/apache/coyote/http2/TestHttp2Limits.java | 10 +-
test/org/apache/el/TestELInJsp.java | 10 +
test/org/apache/el/TestMethodExpressionImpl.java | 6 +-
test/org/apache/tomcat/util/buf/TestByteChunk.java | 40 ++
test/org/apache/tomcat/util/buf/TestCharChunk.java | 57 +++
.../util/http/TestCookiesDefaultSysProps.java | 2 +-
.../util/http/TestCookiesNoFwdStrictSysProps.java | 2 +-
.../http/TestCookiesNoStrictNamingSysProps.java | 2 +-
.../util/http/TestCookiesStrictSysProps.java | 2 +-
.../util/net/TestTLSClientHelloExtractor.java | 89 ++++
.../util/net/openssl/ciphers/TestCipher.java | 32 ++
.../TestOpenSSLCipherConfigurationParser.java | 18 +
.../util/net/openssl/ciphers/TesterOpenSSL.java | 18 +-
.../tomcat/util/scan/TestStandardJarScanner.java | 4 +
.../tomcat/websocket/TestWebSocketFrameClient.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 4 +-
.../tomcat/websocket/server/TestCloseBug58624.java | 2 +-
.../webapp/bug6nnnn/{bug60431.jsp => bug61854.jsp} | 5 +-
webapps/docs/changelog.xml | 334 +++++++++++-
webapps/docs/config/http2.xml | 49 ++
webapps/docs/config/resources.xml | 6 +-
webapps/docs/config/systemprops.xml | 21 +-
webapps/docs/manager-howto.xml | 45 +-
webapps/docs/mbeans-descriptors-howto.xml | 5 +
webapps/docs/ssl-howto.xml | 110 ++++
webapps/docs/windows-service-howto.xml | 29 +-
.../AsyncStockContextListener.java} | 23 +-
.../WEB-INF/classes/async/AsyncStockServlet.java | 53 +-
.../WEB-INF/classes/async/Stockticker.java | 23 +-
.../WEB-INF/classes/http2/SimpleImagePush.java | 62 ---
webapps/examples/WEB-INF/jsp/applet/Clock2.java | 12 +-
webapps/examples/WEB-INF/web.xml | 15 +-
webapps/examples/servlets/index.html | 11 -
webapps/manager/WEB-INF/jsp/404.jsp | 4 +-
.../{connectorCiphers.jsp => connectorCerts.jsp} | 18 +-
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 4 +-
...nectorCiphers.jsp => connectorTrustedCerts.jsp} | 16 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
209 files changed, 6827 insertions(+), 2604 deletions(-)
delete mode 100644 debian/patches/0022-websocket-api-compatibility.patch
copy java/org/apache/catalina/storeconfig/{SSLHostConfigSF.java => OpenSSLConfSF.java} (57%)
create mode 100644 java/org/apache/coyote/CompressionConfig.java
copy java/org/apache/coyote/{http2/HeaderSink.java => http11/HttpOutputBuffer.java} (57%)
create mode 100644 java/org/apache/coyote/http2/Http2OutputBuffer.java
create mode 100644 java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
create mode 100644 java/org/apache/tomcat/dbcp/pool2/impl/CallStackUtils.java
copy java/org/apache/{catalina/webresources/VirtualResource.java => tomcat/dbcp/pool2/impl/NoOpCallStack.java} (61%)
create mode 100644 java/org/apache/tomcat/dbcp/pool2/impl/SecurityManagerCallStack.java
create mode 100644 java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
create mode 100644 java/org/apache/tomcat/util/buf/AbstractChunk.java
copy modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/{XADataSource.java => PooledConnectionMBean.java} (50%)
copy java/org/apache/tomcat/JarScanType.java => modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimerMBean.java (86%)
copy modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/{SlowQueryReportJmxMBean.java => StatementCacheMBean.java} (75%)
create mode 100644 modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/JmxUtil.java
create mode 100644 test/javax/servlet/annotation/TestServletSecurity.java
create mode 100644 test/javax/servlet/annotation/TestServletSecurityMappings.java
create mode 100644 test/org/apache/tomcat/util/net/TestTLSClientHelloExtractor.java
copy test/webapp/bug6nnnn/{bug60431.jsp => bug61854.jsp} (81%)
copy webapps/examples/WEB-INF/classes/{websocket/drawboard/DrawboardContextListener.java => async/AsyncStockContextListener.java} (61%)
delete mode 100644 webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
copy webapps/manager/WEB-INF/jsp/{connectorCiphers.jsp => connectorCerts.jsp} (83%)
copy webapps/manager/WEB-INF/jsp/{connectorCiphers.jsp => connectorTrustedCerts.jsp} (85%)
--
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