[tomcat8] 01/05: Merge tag 'upstream/8.0.32'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Feb 10 16:33:37 GMT 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 6e485f09b0f4b683116f7026e8a99d306fe977e3
Merge: d18234a 0da256a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Feb 10 16:08:51 2016 +0100
Merge tag 'upstream/8.0.32'
Upstream version 8.0.32
BUILDING.txt | 19 +-
NOTICE | 2 +-
build.properties.default | 11 +-
build.xml | 47 +-
java/javax/servlet/ServletContext.java | 1 +
java/org/apache/catalina/Context.java | 9 +
java/org/apache/catalina/InstanceEvent.java | 3 +
java/org/apache/catalina/InstanceListener.java | 3 +
java/org/apache/catalina/Lifecycle.java | 51 +-
java/org/apache/catalina/LifecycleState.java | 16 +
java/org/apache/catalina/Manager.java | 38 +-
java/org/apache/catalina/Session.java | 19 +
java/org/apache/catalina/Wrapper.java | 6 +
.../apache/catalina/ant/AbstractCatalinaTask.java | 26 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 24 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 8 +-
.../authenticator/SingleSignOnListener.java | 3 -
java/org/apache/catalina/connector/Connector.java | 4 +-
.../apache/catalina/connector/CoyoteAdapter.java | 40 +-
.../catalina/connector/LocalStrings.properties | 2 +
java/org/apache/catalina/connector/Request.java | 53 ++-
java/org/apache/catalina/connector/Response.java | 50 +-
.../catalina/connector/mbeans-descriptors.xml | 7 +-
.../catalina/core/ApplicationDispatcher.java | 5 +-
.../catalina/core/ApplicationFilterChain.java | 4 +
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java | 1 +
.../catalina/core/ApplicationHttpRequest.java | 105 ++---
.../org/apache/catalina/core/AsyncContextImpl.java | 45 +-
.../catalina/core/DefaultInstanceManager.java | 76 +--
.../apache/catalina/core/LocalStrings.properties | 12 +-
.../catalina/core/NamingContextListener.java | 2 +-
.../catalina/core/RestrictedServlets.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 46 +-
.../apache/catalina/core/StandardHostValve.java | 4 +-
java/org/apache/catalina/core/StandardServer.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 59 ++-
.../apache/catalina/core/mbeans-descriptors.xml | 4 +-
.../catalina/deploy/NamingResourcesImpl.java | 22 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 53 ++-
java/org/apache/catalina/ha/ClusterManager.java | 8 +
.../apache/catalina/ha/session/BackupManager.java | 5 -
.../catalina/ha/session/ClusterManagerBase.java | 67 +--
.../apache/catalina/ha/session/DeltaManager.java | 81 +---
.../apache/catalina/ha/session/DeltaSession.java | 47 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 25 +-
.../catalina/ha/session/LocalStrings.properties | 1 -
.../catalina/ha/session/LocalStrings_es.properties | 1 -
.../catalina/ha/session/mbeans-descriptors.xml | 24 +
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 23 +-
.../apache/catalina/loader/LocalStrings.properties | 1 -
.../catalina/loader/LocalStrings_es.properties | 1 -
.../catalina/loader/LocalStrings_fr.properties | 1 -
.../catalina/loader/LocalStrings_ja.properties | 1 -
.../catalina/loader/WebappClassLoaderBase.java | 132 ++++--
java/org/apache/catalina/loader/WebappLoader.java | 6 +-
java/org/apache/catalina/manager/Constants.java | 2 +-
.../apache/catalina/manager/DummyProxySession.java | 5 +
.../catalina/manager/HTMLManagerServlet.java | 28 +-
.../catalina/manager/LocalStrings.properties | 2 +-
.../apache/catalina/manager/ManagerServlet.java | 2 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../catalina/manager/host/HostManagerServlet.java | 21 +-
.../apache/catalina/manager/util/SessionUtils.java | 10 +-
java/org/apache/catalina/mapper/Mapper.java | 8 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 32 +-
.../mbeans/JmxRemoteLifecycleListener.java | 6 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 15 +-
.../catalina/security/SecurityClassLoad.java | 1 +
java/org/apache/catalina/servlets/CGIServlet.java | 25 +-
.../apache/catalina/servlets/DefaultServlet.java | 104 ++--
java/org/apache/catalina/session/Constants.java | 19 +-
java/org/apache/catalina/session/FileStore.java | 142 ++----
java/org/apache/catalina/session/JDBCStore.java | 77 ++-
.../catalina/session/LocalStrings.properties | 7 +-
.../catalina/session/LocalStrings_es.properties | 1 -
.../catalina/session/LocalStrings_fr.properties | 1 -
.../catalina/session/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/session/ManagerBase.java | 521 +++++++++++----------
.../apache/catalina/session/PersistentManager.java | 9 +-
.../catalina/session/PersistentManagerBase.java | 32 +-
.../apache/catalina/session/StandardManager.java | 295 ++++--------
.../apache/catalina/session/StandardSession.java | 104 ++--
.../catalina/session/StandardSessionFacade.java | 11 +-
java/org/apache/catalina/session/StoreBase.java | 39 +-
.../apache/catalina/session/mbeans-descriptors.xml | 24 +
java/org/apache/catalina/ssi/SSIFsize.java | 4 +-
java/org/apache/catalina/startup/Bootstrap.java | 6 +-
java/org/apache/catalina/startup/Catalina.java | 118 ++---
.../org/apache/catalina/startup/ContextConfig.java | 118 +++--
.../catalina/startup/CredentialHandlerRuleSet.java | 32 +-
java/org/apache/catalina/startup/HostConfig.java | 177 +++----
.../catalina/startup/LocalStrings.properties | 6 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 33 +-
java/org/apache/catalina/startup/Tomcat.java | 73 ++-
java/org/apache/catalina/startup/UserConfig.java | 4 +-
.../catalina/startup/WebappServiceLoader.java | 7 +-
.../catalina/storeconfig/InstanceListenerSF.java | 1 +
.../catalina/storeconfig/StandardContextSF.java | 3 +-
.../catalina/storeconfig/StandardEngineSF.java | 16 +-
java/org/apache/catalina/tribes/UniqueId.java | 4 +-
.../apache/catalina/tribes/group/GroupChannel.java | 4 +-
.../interceptors/DomainFilterInterceptor.java | 2 +-
.../group/interceptors/LocalStrings.properties | 2 +
.../interceptors/MessageDispatch15Interceptor.java | 105 +----
.../interceptors/MessageDispatchInterceptor.java | 238 +++++++---
.../interceptors/StaticMembershipInterceptor.java | 106 ++++-
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 12 +-
.../tribes/tipis/AbstractReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../tribes/transport/bio/util/FastQueue.java | 3 +
.../tribes/transport/bio/util/LinkObject.java | 3 +
.../bio/util/SingleRemoveSynchronizedAddLock.java | 4 +-
.../catalina/tribes/util/TcclThreadFactory.java | 1 +
.../catalina/util/CustomObjectInputStream.java | 99 +++-
java/org/apache/catalina/util/IOTools.java | 3 +
java/org/apache/catalina/util/InstanceSupport.java | 3 +
java/org/apache/catalina/util/LifecycleBase.java | 82 ++--
.../apache/catalina/util/LocalStrings.properties | 2 +
java/org/apache/catalina/util/RequestUtil.java | 6 +
java/org/apache/catalina/util/UriUtil.java | 62 +++
.../apache/catalina/valves/JDBCAccessLogValve.java | 10 +-
.../apache/catalina/valves/PersistentValve.java | 3 -
.../apache/catalina/valves/RemoteAddrValve.java | 2 +-
.../apache/catalina/valves/RemoteHostValve.java | 2 +-
.../catalina/valves/rewrite/RewriteValve.java | 30 +-
.../catalina/webresources/DirResourceSet.java | 20 +-
java/org/apache/coyote/AbstractProtocol.java | 16 +-
java/org/apache/coyote/Request.java | 2 +-
java/org/apache/coyote/Response.java | 28 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 20 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 19 +
.../coyote/http11/AbstractHttp11Processor.java | 5 +-
.../coyote/http11/InternalAprInputBuffer.java | 3 +-
.../coyote/http11/InternalNio2InputBuffer.java | 4 +-
.../coyote/http11/InternalNio2OutputBuffer.java | 4 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 2 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 3 +
.../coyote/http11/upgrade/LocalStrings.properties | 1 +
.../http11/upgrade/Nio2ServletInputStream.java | 4 +-
.../http11/upgrade/Nio2ServletOutputStream.java | 4 +-
java/org/apache/el/stream/Stream.java | 2 +-
java/org/apache/el/util/MessageFactory.java | 12 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/compiler/Compiler.java | 53 +--
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
java/org/apache/jasper/compiler/SmapUtil.java | 6 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagPluginManager.java | 8 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 25 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 2 +-
java/org/apache/juli/ClassLoaderLogManager.java | 4 +-
.../apache/naming/factory/ResourceLinkFactory.java | 5 +
java/org/apache/tomcat/util/buf/MessageBytes.java | 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 14 +-
.../org/apache/tomcat/util/http/CookieSupport.java | 14 +-
.../tomcat/util/http/LegacyCookieProcessor.java | 57 ++-
.../apache/tomcat/util/http/parser/HttpParser.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 2 -
.../tomcat/util/modeler/NotificationInfo.java | 2 +-
.../apache/tomcat/util/modeler/OperationInfo.java | 2 +-
java/org/apache/tomcat/util/net/URL.java | 4 +
.../tomcat/util/net/jsse/openssl/Cipher.java | 113 +++++
.../tomcat/util/net/jsse/openssl/Encryption.java | 1 +
.../tomcat/util/net/jsse/openssl/KeyExchange.java | 2 +-
java/org/apache/tomcat/util/res/StringManager.java | 76 ++-
.../tomcat/util/scan/StandardJarScanner.java | 7 +-
.../tomcat/websocket/LocalStrings.properties | 3 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 6 +
.../org/apache/tomcat/websocket/WsFrameClient.java | 6 +
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 49 +-
java/org/apache/tomcat/websocket/WsSession.java | 39 +-
.../websocket/server/LocalStrings.properties | 3 +
.../tomcat/websocket/server/WsFrameServer.java | 21 +-
.../websocket/server/WsHttpUpgradeHandler.java | 3 +
.../server/WsRemoteEndpointImplServer.java | 1 +
modules/jdbc-pool/NOTICE | 2 +-
res/findbugs/filter-false-positives.xml | 332 ++++++++++++-
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 4 -
res/welcome.bin.html | 4 -
res/welcome.main.html | 4 -
.../org/apache/catalina/connector/TestRequest.java | 20 +
.../apache/catalina/connector/TestSendFile.java | 28 +-
.../catalina/core/TestApplicationHttpRequest.java | 357 ++++++++++++++
.../apache/catalina/core/TestAsyncContextImpl.java | 72 ++-
.../core/TestStandardContextResources.java | 6 +-
.../apache/catalina/loader/TestVirtualContext.java | 14 +-
.../catalina/loader/TestWebappClassLoader.java | 91 ++++
.../apache/catalina/mapper/TestMapperWebapps.java | 1 +
.../catalina/session/TestPersistentManager.java | 6 +-
.../startup/TestHostConfigAutomaticDeployment.java | 80 ++++
test/org/apache/catalina/startup/TestTomcat.java | 39 +-
.../apache/catalina/startup/TomcatBaseTest.java | 8 +-
.../catalina/tribes/demos/ChannelCreator.java | 3 +-
.../catalina/tribes/demos/CoordinationDemo.java | 4 +-
.../tribes/test/channel/TestDataIntegrity.java | 6 +-
.../tribes/test/channel/TestMulticastPackages.java | 6 +-
.../test/channel/TestRemoteProcessException.java | 29 +-
.../tribes/test/channel/TestUdpPackages.java | 6 +-
.../tomcat/util/descriptor/web/TestWebRuleSet.java | 6 +-
.../apache/tomcat/util/http/TestCookieParsing.java | 19 +-
.../tomcat/util/net/jsse/openssl/TestCipher.java | 29 +-
.../TestOpenSSLCipherConfigurationParser.java | 25 +-
.../TestOpenSSLCipherConfigurationParserOnly.java | 2 +-
.../util/net/jsse/openssl/TesterOpenSSL.java | 65 ++-
.../tomcat/util/scan/TestStandardJarScanner.java | 26 +
.../apache/tomcat/websocket/server/TestClose.java | 371 +++++++++++++++
.../websocket/server/TesterWsCloseClient.java | 126 +++++
webapps/docs/building.xml | 2 +-
webapps/docs/changelog.xml | 300 +++++++++++-
webapps/docs/config/ajp.xml | 12 +
webapps/docs/config/cluster-channel.xml | 3 +-
webapps/docs/config/cluster-manager.xml | 71 ++-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/cookie-processor.xml | 12 +-
webapps/docs/config/filter.xml | 8 +
webapps/docs/config/manager.xml | 78 +++
webapps/docs/config/systemprops.xml | 15 +-
webapps/docs/funcspecs/mbean-names.xml | 64 +--
webapps/docs/jndi-resources-howto.xml | 4 +-
webapps/docs/manager-howto.xml | 62 ++-
webapps/host-manager/WEB-INF/jsp/401.jsp | 1 +
webapps/host-manager/WEB-INF/jsp/403.jsp | 1 +
webapps/host-manager/WEB-INF/jsp/404.jsp | 3 +-
webapps/host-manager/index.jsp | 4 +-
webapps/manager/WEB-INF/jsp/401.jsp | 1 +
webapps/manager/WEB-INF/jsp/403.jsp | 1 +
webapps/manager/WEB-INF/jsp/404.jsp | 3 +-
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
webapps/manager/WEB-INF/web.xml | 1 -
webapps/manager/index.jsp | 4 +-
237 files changed, 4927 insertions(+), 2480 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