[tomcat7] 09/11: Merge tag 'upstream/7.0.68'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Feb 18 22:07:22 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 7801818d2cd741a88dd7fa88629f6f02c15518d7
Merge: 3f21a38 0a20155
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Feb 18 10:24:04 2016 +0100
Merge tag 'upstream/7.0.68'
Upstream version 7.0.68
BUILDING.txt | 19 +-
NOTICE | 2 +-
build.properties.default | 7 +-
build.xml | 9 +-
java/org/apache/catalina/Lifecycle.java | 51 +-
java/org/apache/catalina/LifecycleState.java | 16 +
java/org/apache/catalina/Manager.java | 37 +-
java/org/apache/catalina/Session.java | 19 +
.../apache/catalina/ant/AbstractCatalinaTask.java | 34 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 8 +-
.../authenticator/SingleSignOnListener.java | 3 -
.../catalina/connector/ClientAbortException.java | 4 +-
java/org/apache/catalina/connector/Connector.java | 4 +-
.../apache/catalina/connector/CoyoteAdapter.java | 64 ++-
.../catalina/connector/LocalStrings.properties | 2 +
java/org/apache/catalina/connector/Request.java | 41 +-
java/org/apache/catalina/connector/Response.java | 33 +-
.../catalina/connector/mbeans-descriptors.xml | 7 +-
.../catalina/core/ApplicationDispatcher.java | 4 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationHttpRequest.java | 108 ++---
.../org/apache/catalina/core/AsyncContextImpl.java | 47 +-
java/org/apache/catalina/core/ContainerBase.java | 10 +-
.../catalina/core/DefaultInstanceManager.java | 76 +--
.../apache/catalina/core/LocalStrings.properties | 14 +-
.../catalina/core/NamingContextListener.java | 2 +-
.../catalina/core/RestrictedServlets.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 21 +-
.../apache/catalina/core/StandardHostValve.java | 4 +-
java/org/apache/catalina/core/StandardServer.java | 17 +-
java/org/apache/catalina/core/StandardService.java | 15 +-
java/org/apache/catalina/core/StandardWrapper.java | 43 +-
.../apache/catalina/deploy/InjectionTarget.java | 7 +-
.../apache/catalina/deploy/NamingResources.java | 28 +-
.../apache/catalina/deploy/SecurityRoleRef.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 | 47 +-
.../apache/catalina/ha/session/DeltaSession.java | 48 +-
.../catalina/ha/session/mbeans-descriptors.xml | 24 +
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 23 +-
.../catalina/loader/WebappClassLoaderBase.java | 24 +-
java/org/apache/catalina/loader/WebappLoader.java | 1 -
java/org/apache/catalina/manager/Constants.java | 2 +-
.../apache/catalina/manager/DummyProxySession.java | 5 +
.../catalina/manager/HTMLManagerServlet.java | 23 +-
.../catalina/manager/LocalStrings.properties | 2 +-
.../apache/catalina/manager/ManagerServlet.java | 11 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../apache/catalina/manager/util/SessionUtils.java | 10 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 32 +-
.../mbeans/JmxRemoteLifecycleListener.java | 6 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 15 +-
java/org/apache/catalina/servlets/CGIServlet.java | 7 +-
.../apache/catalina/servlets/DefaultServlet.java | 128 +++--
java/org/apache/catalina/session/Constants.java | 19 +-
java/org/apache/catalina/session/FileStore.java | 143 ++----
java/org/apache/catalina/session/JDBCStore.java | 53 +--
.../catalina/session/LocalStrings.properties | 4 +
java/org/apache/catalina/session/ManagerBase.java | 519 +++++++++++----------
.../apache/catalina/session/PersistentManager.java | 22 +-
.../catalina/session/PersistentManagerBase.java | 32 +-
.../apache/catalina/session/StandardManager.java | 150 +++---
.../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 +-
.../org/apache/catalina/startup/ContextConfig.java | 27 +-
java/org/apache/catalina/startup/HostConfig.java | 179 +++----
.../catalina/startup/LocalStrings.properties | 7 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 31 +-
java/org/apache/catalina/startup/TldConfig.java | 2 +-
java/org/apache/catalina/startup/Tomcat.java | 75 +--
java/org/apache/catalina/startup/UserConfig.java | 4 +-
java/org/apache/catalina/startup/WebRuleSet.java | 14 +-
java/org/apache/catalina/tribes/UniqueId.java | 4 +-
.../interceptors/DomainFilterInterceptor.java | 2 +-
.../interceptors/StaticMembershipInterceptor.java | 107 ++++-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 12 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../catalina/tribes/util/TcclThreadFactory.java | 1 +
.../catalina/util/CustomObjectInputStream.java | 99 +++-
java/org/apache/catalina/util/LifecycleBase.java | 82 ++--
.../apache/catalina/util/LocalStrings.properties | 2 +
.../apache/catalina/valves/JDBCAccessLogValve.java | 12 +-
.../apache/catalina/valves/PersistentValve.java | 7 +-
.../apache/catalina/valves/RemoteAddrValve.java | 2 +-
.../apache/catalina/valves/RemoteHostValve.java | 2 +-
java/org/apache/coyote/Response.java | 26 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 20 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 18 +
java/org/apache/coyote/ajp/AjpAprProtocol.java | 1 +
java/org/apache/coyote/ajp/AjpNioProtocol.java | 1 +
java/org/apache/coyote/ajp/AjpProtocol.java | 1 +
.../coyote/http11/AbstractHttp11Processor.java | 8 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 2 +-
java/org/apache/el/util/MessageFactory.java | 12 +-
java/org/apache/jasper/JspC.java | 153 +++---
java/org/apache/jasper/compiler/Compiler.java | 53 +--
java/org/apache/jasper/compiler/JDTCompiler.java | 79 ++--
.../apache/jasper/compiler/JspDocumentParser.java | 8 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
java/org/apache/jasper/compiler/SmapUtil.java | 32 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagPluginManager.java | 38 +-
.../apache/jasper/compiler/TldLocationsCache.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 +
.../apache/naming/resources/EmptyDirContext.java | 4 +-
.../apache/naming/resources/FileDirContext.java | 37 +-
.../org/apache/naming/resources/ResourceCache.java | 38 +-
java/org/apache/tomcat/buildutil/Txt2Html.java | 69 +--
.../org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
java/org/apache/tomcat/util/buf/C2BConverter.java | 8 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 40 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 7 +-
java/org/apache/tomcat/util/http/Cookies.java | 2 +-
java/org/apache/tomcat/util/http/Parameters.java | 2 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 8 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 2 -
.../apache/tomcat/util/modeler/ManagedBean.java | 122 +++--
.../tomcat/util/modeler/NotificationInfo.java | 40 +-
.../apache/tomcat/util/modeler/OperationInfo.java | 33 +-
.../modules/MbeansDescriptorsSerSource.java | 19 +-
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 | 31 +-
.../websocket/server/LocalStrings.properties | 3 +
.../tomcat/websocket/server/WsFrameServer.java | 21 +-
.../websocket/server/WsHttpUpgradeHandler.java | 2 +
modules/jdbc-pool/NOTICE | 2 +-
res/findbugs/filter-false-positives.xml | 371 ++++++++++++++-
res/maven/mvn.properties.default | 2 +-
.../org/apache/catalina/connector/TestRequest.java | 20 +
.../catalina/core/TestApplicationHttpRequest.java | 357 ++++++++++++++
.../apache/catalina/core/TestAsyncContextImpl.java | 72 ++-
.../filters/TestRestCsrfPreventionFilter.java | 4 +-
.../ha/session/TestSerializablePrincipal.java | 21 +-
.../apache/catalina/loader/TestVirtualContext.java | 33 +-
.../loader/TestWebappClassLoaderWeaving.java | 15 +-
.../catalina/session/TestPersistentManager.java | 6 +-
test/org/apache/catalina/startup/TestTomcat.java | 35 +-
.../apache/catalina/startup/TestWebRuleSet.java | 14 +-
.../test/channel/TestRemoteProcessException.java | 29 +-
.../tribes/test/transport/SocketReceive.java | 1 -
.../catalina/tribes/test/transport/SocketSend.java | 2 +-
.../catalina/valves/TesterAccessLogValve.java | 1 +
.../apache/tomcat/util/http/mapper/TestMapper.java | 36 +-
.../tomcat/util/http/mapper/TestMapperWebapps.java | 1 +
.../apache/tomcat/websocket/TesterEchoServer.java | 2 +-
.../apache/tomcat/websocket/server/TestClose.java | 360 ++++++++++++++
.../websocket/server/TesterWsCloseClient.java | 127 +++++
webapps/docs/changelog.xml | 252 +++++++++-
webapps/docs/config/ajp.xml | 12 +
webapps/docs/config/automatic-deployment.xml | 7 +-
webapps/docs/config/cluster-manager.xml | 71 ++-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/filter.xml | 8 +
webapps/docs/config/manager.xml | 78 ++++
webapps/docs/jndi-resources-howto.xml | 4 +-
webapps/docs/manager-howto.xml | 70 ++-
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/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
webapps/manager/WEB-INF/web.xml | 1 -
webapps/manager/index.jsp | 4 +-
183 files changed, 4336 insertions(+), 1956 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list