[tomcat8] branch master updated (f29b6bd -> e7a5e65)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Feb 12 08:04:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat8.
from f29b6bd Updated the location of the Tomcat 8 tags
adds 25d52ee Imported Upstream version 8.0.3
new 4248d54 Merge tag 'upstream/8.0.3'
new e7a5e65 New upstream release (8.0.3) Refreshed the patches
The 2 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:
.gitignore | 1 +
BUILDING.txt | 8 +-
NOTICE | 2 +-
RELEASE-NOTES | 2 -
RUNNING.txt | 2 -
SVN-MERGE.txt | 2 -
TOMCAT-NEXT.txt | 1 +
bin/catalina-tasks.xml | 1 +
bin/catalina.bat | 4 -
bin/catalina.sh | 22 +-
bin/configtest.bat | 2 -
bin/configtest.sh | 2 -
bin/cpappend.bat | 2 -
bin/daemon.sh | 2 -
bin/digest.bat | 2 -
bin/digest.sh | 2 -
bin/service.bat | 2 -
bin/setclasspath.bat | 2 -
bin/setclasspath.sh | 2 -
bin/shutdown.bat | 2 -
bin/shutdown.sh | 2 -
bin/startup.bat | 2 -
bin/startup.sh | 2 -
bin/tool-wrapper.bat | 4 +-
bin/tool-wrapper.sh | 4 +-
bin/version.bat | 2 -
bin/version.sh | 2 -
build.properties.default | 20 +-
build.xml | 69 +-
conf/catalina.policy | 2 -
conf/catalina.properties | 4 +-
conf/context.xml | 13 -
debian/changelog | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
debian/patches/0005-skip-test-failures.patch | 4 +-
...-java.security.policy-file-in-catalina.sh.patch | 6 +-
debian/patches/0010-debianize-build-xml.patch | 4 +-
debian/patches/0012-java7-compat.patch | 2 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0018-fix-manager-webapp.patch | 8 +-
java/javax/servlet/AsyncContext.java | 1 -
java/javax/servlet/AsyncListener.java | 3 +-
java/javax/servlet/GenericServlet.java | 2 -
java/javax/servlet/Registration.java | 3 +-
java/javax/servlet/RequestDispatcher.java | 3 -
java/javax/servlet/Servlet.java | 2 -
java/javax/servlet/ServletContext.java | 2 -
java/javax/servlet/ServletException.java | 3 -
java/javax/servlet/ServletInputStream.java | 2 -
java/javax/servlet/ServletOutputStream.java | 2 -
java/javax/servlet/ServletRegistration.java | 3 +-
java/javax/servlet/ServletRequest.java | 2 -
java/javax/servlet/ServletResponse.java | 2 -
java/javax/servlet/ServletResponseWrapper.java | 2 -
java/javax/servlet/SessionCookieConfig.java | 3 +-
java/javax/servlet/SessionTrackingMode.java | 1 -
java/javax/servlet/SingleThreadModel.java | 2 -
java/javax/servlet/UnavailableException.java | 3 -
java/javax/servlet/http/Cookie.java | 217 ++-
java/javax/servlet/http/HttpServlet.java | 3 -
.../servlet/http/HttpServletResponseWrapper.java | 2 -
.../servlet/http/HttpSessionBindingEvent.java | 2 -
.../servlet/http/HttpSessionBindingListener.java | 2 -
java/javax/servlet/http/HttpSessionContext.java | 2 -
java/javax/servlet/jsp/resources/jspxml.dtd | 5 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
java/javax/servlet/resources/XMLSchema.dtd | 2 +-
java/javax/servlet/resources/datatypes.dtd | 2 +-
java/javax/servlet/resources/j2ee_1_4.xsd | 6 -
.../servlet/resources/j2ee_web_services_1_1.xsd | 6 -
.../resources/j2ee_web_services_client_1_1.xsd | 6 -
java/javax/servlet/resources/javaee_5.xsd | 6 -
java/javax/servlet/resources/javaee_6.xsd | 8 -
.../servlet/resources/javaee_web_services_1_2.xsd | 6 -
.../servlet/resources/javaee_web_services_1_3.xsd | 8 -
.../resources/javaee_web_services_client_1_2.xsd | 6 -
.../resources/javaee_web_services_client_1_3.xsd | 8 -
java/javax/servlet/resources/jsp_2_0.xsd | 6 -
java/javax/servlet/resources/jsp_2_2.xsd | 8 -
java/javax/servlet/resources/web-app_2_4.xsd | 6 -
java/javax/servlet/resources/web-app_2_5.xsd | 5 -
java/javax/servlet/resources/web-app_3_0.xsd | 8 -
java/javax/servlet/resources/web-common_3_0.xsd | 8 -
java/javax/servlet/resources/web-fragment_3_0.xsd | 8 -
.../servlet/resources/web-jsptaglibrary_2_0.xsd | 6 -
java/org/apache/catalina/Authenticator.java | 1 -
java/org/apache/catalina/Cluster.java | 3 -
java/org/apache/catalina/Contained.java | 2 -
java/org/apache/catalina/Container.java | 1 -
java/org/apache/catalina/ContainerEvent.java | 1 -
java/org/apache/catalina/ContainerListener.java | 2 -
java/org/apache/catalina/ContainerServlet.java | 2 -
java/org/apache/catalina/Context.java | 79 +-
java/org/apache/catalina/Engine.java | 2 -
java/org/apache/catalina/Globals.java | 43 +-
java/org/apache/catalina/Group.java | 2 -
java/org/apache/catalina/Host.java | 2 -
java/org/apache/catalina/InstanceEvent.java | 2 -
java/org/apache/catalina/InstanceListener.java | 2 -
java/org/apache/catalina/Lifecycle.java | 1 -
java/org/apache/catalina/LifecycleEvent.java | 2 -
java/org/apache/catalina/LifecycleException.java | 2 -
java/org/apache/catalina/LifecycleListener.java | 2 -
java/org/apache/catalina/Loader.java | 1 -
java/org/apache/catalina/Manager.java | 2 -
java/org/apache/catalina/Pipeline.java | 2 -
java/org/apache/catalina/Realm.java | 2 -
java/org/apache/catalina/Role.java | 2 -
java/org/apache/catalina/Server.java | 2 -
java/org/apache/catalina/Service.java | 2 -
java/org/apache/catalina/Session.java | 2 -
java/org/apache/catalina/SessionEvent.java | 2 -
java/org/apache/catalina/SessionListener.java | 2 -
java/org/apache/catalina/Store.java | 2 -
...raceWrapper.java => ThreadBindingListener.java} | 13 +-
...ceTraceWrapper.java => TrackedWebResource.java} | 2 +-
java/org/apache/catalina/User.java | 2 -
java/org/apache/catalina/UserDatabase.java | 2 -
java/org/apache/catalina/Valve.java | 2 -
java/org/apache/catalina/WebResourceRoot.java | 20 +-
java/org/apache/catalina/WebResourceSet.java | 30 +-
java/org/apache/catalina/Wrapper.java | 2 -
.../apache/catalina/ant/AbstractCatalinaTask.java | 2 -
.../catalina/ant/BaseRedirectorHelperTask.java | 2 -
java/org/apache/catalina/ant/DeployTask.java | 1 -
.../apache/catalina/ant/JKStatusUpdateTask.java | 1 -
java/org/apache/catalina/ant/JMXGetTask.java | 1 -
java/org/apache/catalina/ant/JMXQueryTask.java | 1 -
java/org/apache/catalina/ant/JMXSetTask.java | 1 -
java/org/apache/catalina/ant/ListTask.java | 1 -
java/org/apache/catalina/ant/ReloadTask.java | 1 -
java/org/apache/catalina/ant/ResourcesTask.java | 1 -
java/org/apache/catalina/ant/ServerinfoTask.java | 1 -
java/org/apache/catalina/ant/SessionsTask.java | 1 -
java/org/apache/catalina/ant/StartTask.java | 1 -
java/org/apache/catalina/ant/StopTask.java | 1 -
java/org/apache/catalina/ant/UndeployTask.java | 1 -
java/org/apache/catalina/ant/ValidatorTask.java | 2 -
java/org/apache/catalina/ant/jmx/Arg.java | 1 -
.../catalina/ant/jmx/JMXAccessorCondition.java | 2 -
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 1 -
.../ant/jmx/JMXAccessorEqualsCondition.java | 2 -
.../catalina/ant/jmx/JMXAccessorGetTask.java | 2 -
.../catalina/ant/jmx/JMXAccessorInvokeTask.java | 2 -
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 2 -
.../catalina/ant/jmx/JMXAccessorSetTask.java | 2 -
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 2 -
.../ant/jmx/JMXAccessorUnregisterTask.java | 1 -
.../catalina/authenticator/AuthenticatorBase.java | 1 -
.../catalina/authenticator/BasicAuthenticator.java | 2 -
.../authenticator/DigestAuthenticator.java | 1 -
.../catalina/authenticator/FormAuthenticator.java | 2 -
.../authenticator/NonLoginAuthenticator.java | 1 -
.../catalina/authenticator/SSLAuthenticator.java | 1 -
.../catalina/authenticator/SavedRequest.java | 2 -
.../catalina/authenticator/SingleSignOn.java | 3 -
.../catalina/authenticator/SingleSignOnEntry.java | 1 -
.../authenticator/SpnegoAuthenticator.java | 10 +-
java/org/apache/catalina/comet/CometEvent.java | 1 -
java/org/apache/catalina/comet/CometFilter.java | 1 -
.../apache/catalina/comet/CometFilterChain.java | 1 -
.../catalina/connector/ClientAbortException.java | 1 -
java/org/apache/catalina/connector/Connector.java | 3 -
.../apache/catalina/connector/CoyoteAdapter.java | 55 +-
.../catalina/connector/CoyoteInputStream.java | 1 -
.../apache/catalina/connector/CoyotePrincipal.java | 2 -
.../org/apache/catalina/connector/InputBuffer.java | 16 +-
java/org/apache/catalina/connector/Request.java | 19 -
.../apache/catalina/connector/RequestFacade.java | 3 -
java/org/apache/catalina/connector/Response.java | 36 +-
.../apache/catalina/connector/ResponseFacade.java | 2 -
.../apache/catalina/core/ApplicationContext.java | 8 +-
.../catalina/core/ApplicationContextFacade.java | 3 -
.../catalina/core/ApplicationDispatcher.java | 13 +-
.../catalina/core/ApplicationFilterChain.java | 2 -
.../catalina/core/ApplicationFilterConfig.java | 2 -
.../catalina/core/ApplicationFilterFactory.java | 1 -
.../catalina/core/ApplicationHttpRequest.java | 2 -
.../catalina/core/ApplicationHttpResponse.java | 2 -
.../apache/catalina/core/ApplicationRequest.java | 2 -
.../apache/catalina/core/ApplicationResponse.java | 2 -
.../apache/catalina/core/AprLifecycleListener.java | 3 -
.../org/apache/catalina/core/AsyncContextImpl.java | 92 +-
.../apache/catalina/core/AsyncListenerWrapper.java | 5 -
java/org/apache/catalina/core/ContainerBase.java | 15 +-
.../catalina/core/DefaultInstanceManager.java | 3 -
.../core/JreMemoryLeakPreventionListener.java | 7 +-
.../apache/catalina/core/LocalStrings.properties | 1 +
.../catalina/core/NamingContextListener.java | 2 -
java/org/apache/catalina/core/StandardContext.java | 351 +++--
.../apache/catalina/core/StandardContextValve.java | 1 -
java/org/apache/catalina/core/StandardEngine.java | 2 -
.../apache/catalina/core/StandardEngineValve.java | 2 -
java/org/apache/catalina/core/StandardHost.java | 2 -
.../apache/catalina/core/StandardHostValve.java | 59 +-
java/org/apache/catalina/core/StandardServer.java | 1 -
java/org/apache/catalina/core/StandardWrapper.java | 9 +-
.../catalina/core/StandardWrapperFacade.java | 2 -
.../apache/catalina/core/StandardWrapperValve.java | 2 -
.../apache/catalina/core/mbeans-descriptors.xml | 24 +-
.../catalina/deploy/NamingResourcesImpl.java | 2 -
java/org/apache/catalina/filters/Constants.java | 1 -
.../apache/catalina/filters/RemoteIpFilter.java | 4 +
java/org/apache/catalina/ha/CatalinaCluster.java | 4 -
java/org/apache/catalina/ha/ClusterDeployer.java | 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 2 -
java/org/apache/catalina/ha/ClusterManager.java | 1 -
java/org/apache/catalina/ha/ClusterMessage.java | 5 -
.../org/apache/catalina/ha/ClusterMessageBase.java | 12 -
java/org/apache/catalina/ha/ClusterRuleSet.java | 3 -
java/org/apache/catalina/ha/ClusterValve.java | 2 -
.../catalina/ha/context/ReplicatedContext.java | 1 -
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 10 +-
.../org/apache/catalina/ha/deploy/FileMessage.java | 1 -
.../catalina/ha/deploy/FileMessageFactory.java | 1 -
java/org/apache/catalina/ha/deploy/WarWatcher.java | 1 -
.../apache/catalina/ha/session/BackupManager.java | 1 -
.../catalina/ha/session/ClusterManagerBase.java | 29 +-
.../ha/session/ClusterSessionListener.java | 2 -
.../apache/catalina/ha/session/DeltaManager.java | 41 +-
.../apache/catalina/ha/session/DeltaRequest.java | 3 -
.../apache/catalina/ha/session/DeltaSession.java | 17 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 1 -
.../catalina/ha/session/SerializablePrincipal.java | 2 -
.../catalina/ha/session/SessionMessageImpl.java | 3 -
java/org/apache/catalina/ha/tcp/Constants.java | 2 -
.../apache/catalina/ha/tcp/ReplicationValve.java | 3 -
.../apache/catalina/ha/tcp/SendMessageData.java | 1 -
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 8 +-
.../apache/catalina/loader/LocalStrings.properties | 6 +-
java/org/apache/catalina/loader/ResourceEntry.java | 1 -
.../apache/catalina/loader/WebappClassLoader.java | 317 ++--
java/org/apache/catalina/loader/WebappLoader.java | 1 -
java/org/apache/catalina/manager/Constants.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 34 +-
.../apache/catalina/manager/ManagerServlet.java | 2 -
.../catalina/manager/StatusManagerServlet.java | 2 -
.../apache/catalina/manager/StatusTransformer.java | 8 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../manager/host/HTMLHostManagerServlet.java | 2 -
.../catalina/manager/host/HostManagerServlet.java | 2 -
.../org/apache/catalina/mbeans/ClassNameMBean.java | 2 -
.../org/apache/catalina/mbeans/ConnectorMBean.java | 2 -
.../catalina/mbeans/ContextEnvironmentMBean.java | 2 -
.../catalina/mbeans/ContextResourceLinkMBean.java | 2 -
.../catalina/mbeans/ContextResourceMBean.java | 2 -
.../mbeans/GlobalResourcesLifecycleListener.java | 2 -
java/org/apache/catalina/mbeans/GroupMBean.java | 2 -
.../mbeans/JmxRemoteLifecycleListener.java | 17 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 -
java/org/apache/catalina/mbeans/MBeanUtils.java | 10 +-
.../catalina/mbeans/MemoryUserDatabaseMBean.java | 2 -
.../catalina/mbeans/NamingResourcesMBean.java | 2 -
java/org/apache/catalina/mbeans/RoleMBean.java | 2 -
java/org/apache/catalina/mbeans/UserMBean.java | 2 -
java/org/apache/catalina/realm/Constants.java | 2 -
.../org/apache/catalina/realm/DataSourceRealm.java | 1 -
.../apache/catalina/realm/GenericPrincipal.java | 2 -
.../apache/catalina/realm/JAASCallbackHandler.java | 2 -
.../catalina/realm/JAASMemoryLoginModule.java | 2 -
java/org/apache/catalina/realm/JAASRealm.java | 6 +-
java/org/apache/catalina/realm/JDBCRealm.java | 2 -
java/org/apache/catalina/realm/JNDIRealm.java | 2 -
.../apache/catalina/realm/LocalStrings.properties | 2 -
.../catalina/realm/LocalStrings_es.properties | 2 +-
.../catalina/realm/LocalStrings_fr.properties | 2 -
.../catalina/realm/LocalStrings_ja.properties | 2 -
java/org/apache/catalina/realm/MemoryRealm.java | 2 -
java/org/apache/catalina/realm/MemoryRuleSet.java | 2 -
java/org/apache/catalina/realm/RealmBase.java | 2 -
.../apache/catalina/realm/UserDatabaseRealm.java | 2 -
.../catalina/security/SecurityClassLoad.java | 19 +-
.../apache/catalina/security/SecurityConfig.java | 1 -
.../org/apache/catalina/security/SecurityUtil.java | 2 -
java/org/apache/catalina/servlets/CGIServlet.java | 9 -
.../apache/catalina/servlets/DefaultServlet.java | 33 +-
.../apache/catalina/servlets/WebdavServlet.java | 4 +-
java/org/apache/catalina/session/FileStore.java | 2 -
java/org/apache/catalina/session/JDBCStore.java | 2 -
java/org/apache/catalina/session/ManagerBase.java | 2 -
.../apache/catalina/session/PersistentManager.java | 2 -
.../catalina/session/PersistentManagerBase.java | 3 -
.../apache/catalina/session/StandardManager.java | 3 -
.../apache/catalina/session/StandardSession.java | 43 +-
.../catalina/session/StandardSessionFacade.java | 2 -
java/org/apache/catalina/session/StoreBase.java | 2 -
.../catalina/ssi/ByteArrayServletOutputStream.java | 1 -
.../apache/catalina/ssi/ExpressionParseTree.java | 1 -
.../apache/catalina/ssi/ExpressionTokenizer.java | 1 -
.../catalina/ssi/ResponseIncludeWrapper.java | 1 -
java/org/apache/catalina/ssi/SSICommand.java | 1 -
java/org/apache/catalina/ssi/SSIConditional.java | 1 -
.../apache/catalina/ssi/SSIConditionalState.java | 1 -
java/org/apache/catalina/ssi/SSIConfig.java | 1 -
java/org/apache/catalina/ssi/SSIEcho.java | 1 -
java/org/apache/catalina/ssi/SSIExec.java | 1 -
.../apache/catalina/ssi/SSIExternalResolver.java | 1 -
java/org/apache/catalina/ssi/SSIFilter.java | 1 -
java/org/apache/catalina/ssi/SSIFlastmod.java | 1 -
java/org/apache/catalina/ssi/SSIFsize.java | 1 -
java/org/apache/catalina/ssi/SSIInclude.java | 1 -
java/org/apache/catalina/ssi/SSIMediator.java | 1 -
java/org/apache/catalina/ssi/SSIPrintenv.java | 1 -
java/org/apache/catalina/ssi/SSIProcessor.java | 1 -
java/org/apache/catalina/ssi/SSIServlet.java | 1 -
.../catalina/ssi/SSIServletExternalResolver.java | 1 -
java/org/apache/catalina/ssi/SSISet.java | 1 -
.../catalina/ssi/SSIStopProcessingException.java | 1 -
java/org/apache/catalina/startup/Bootstrap.java | 1 -
java/org/apache/catalina/startup/Catalina.java | 4 +-
.../catalina/startup/CatalinaProperties.java | 1 -
.../catalina/startup/ClassLoaderFactory.java | 1 -
.../org/apache/catalina/startup/ContextConfig.java | 8 +-
.../apache/catalina/startup/ContextRuleSet.java | 2 -
.../startup/CopyParentClassLoaderRule.java | 2 -
java/org/apache/catalina/startup/EngineConfig.java | 2 -
.../org/apache/catalina/startup/EngineRuleSet.java | 2 -
java/org/apache/catalina/startup/ExpandWar.java | 2 -
.../org/apache/catalina/startup/FailedContext.java | 27 +-
.../apache/catalina/startup/HomesUserDatabase.java | 2 -
java/org/apache/catalina/startup/HostConfig.java | 13 +-
java/org/apache/catalina/startup/HostRuleSet.java | 2 -
.../org/apache/catalina/startup/NamingRuleSet.java | 2 -
.../catalina/startup/PasswdUserDatabase.java | 2 -
java/org/apache/catalina/startup/RealmRuleSet.java | 3 -
.../catalina/startup/SetAllPropertiesRule.java | 1 -
java/org/apache/catalina/startup/Tool.java | 2 -
java/org/apache/catalina/startup/UserConfig.java | 2 -
java/org/apache/catalina/startup/UserDatabase.java | 2 -
.../apache/catalina/startup/WebAnnotationSet.java | 2 -
.../catalina/startup/WebappServiceLoader.java | 20 +-
.../catalina/storeconfig/StandardContextSF.java | 2 +-
.../catalina/storeconfig/server-registry.xml | 2 +-
java/org/apache/catalina/tribes/ByteMessage.java | 3 -
java/org/apache/catalina/tribes/Channel.java | 2 -
.../apache/catalina/tribes/ChannelException.java | 4 -
.../apache/catalina/tribes/ChannelInterceptor.java | 3 -
.../apache/catalina/tribes/ChannelListener.java | 1 -
.../org/apache/catalina/tribes/ChannelMessage.java | 1 -
.../apache/catalina/tribes/ChannelReceiver.java | 2 -
java/org/apache/catalina/tribes/ChannelSender.java | 2 -
java/org/apache/catalina/tribes/ErrorHandler.java | 1 -
java/org/apache/catalina/tribes/Heartbeat.java | 1 -
.../org/apache/catalina/tribes/ManagedChannel.java | 2 -
java/org/apache/catalina/tribes/Member.java | 2 -
.../apache/catalina/tribes/MembershipListener.java | 5 -
.../apache/catalina/tribes/MembershipService.java | 4 -
.../apache/catalina/tribes/MessageListener.java | 1 -
.../catalina/tribes/RemoteProcessException.java | 1 -
java/org/apache/catalina/tribes/UniqueId.java | 1 -
.../catalina/tribes/group/AbsoluteOrder.java | 1 -
.../catalina/tribes/group/ChannelCoordinator.java | 2 -
.../tribes/group/ChannelInterceptorBase.java | 3 -
.../catalina/tribes/group/ExtendedRpcCallback.java | 1 -
.../apache/catalina/tribes/group/GroupChannel.java | 2 -
.../catalina/tribes/group/InterceptorPayload.java | 1 -
.../org/apache/catalina/tribes/group/Response.java | 1 -
.../apache/catalina/tribes/group/RpcCallback.java | 1 -
.../apache/catalina/tribes/group/RpcChannel.java | 2 -
.../apache/catalina/tribes/group/RpcMessage.java | 10 -
.../interceptors/DomainFilterInterceptor.java | 1 -
.../interceptors/FragmentationInterceptor.java | 1 -
.../tribes/group/interceptors/GzipInterceptor.java | 1 -
.../interceptors/MessageDispatch15Interceptor.java | 1 -
.../interceptors/MessageDispatchInterceptor.java | 1 -
.../group/interceptors/NonBlockingCoordinator.java | 1 -
.../group/interceptors/OrderInterceptor.java | 1 -
.../group/interceptors/TcpFailureDetector.java | 1 -
.../group/interceptors/TcpPingInterceptor.java | 1 -
.../group/interceptors/ThroughputInterceptor.java | 1 -
.../interceptors/TwoPhaseCommitInterceptor.java | 10 -
java/org/apache/catalina/tribes/io/BufferPool.java | 1 -
.../catalina/tribes/io/BufferPool15Impl.java | 1 -
.../org/apache/catalina/tribes/io/ChannelData.java | 3 -
.../tribes/io/DirectByteArrayOutputStream.java | 1 -
.../apache/catalina/tribes/io/ListenCallback.java | 2 -
.../apache/catalina/tribes/io/ObjectReader.java | 3 -
.../catalina/tribes/io/ReplicationStream.java | 3 -
.../org/apache/catalina/tribes/io/XByteBuffer.java | 6 +-
.../catalina/tribes/membership/Constants.java | 2 -
.../catalina/tribes/membership/McastService.java | 5 -
.../tribes/membership/McastServiceImpl.java | 2 -
.../catalina/tribes/membership/MemberImpl.java | 3 -
.../catalina/tribes/membership/Membership.java | 2 -
.../catalina/tribes/membership/StaticMember.java | 11 -
.../tribes/tipis/AbstractReplicatedMap.java | 1 -
.../catalina/tribes/tipis/LazyReplicatedMap.java | 1 -
.../catalina/tribes/tipis/ReplicatedMap.java | 11 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 1 -
.../catalina/tribes/transport/AbstractRxTask.java | 5 -
.../catalina/tribes/transport/AbstractSender.java | 11 -
.../catalina/tribes/transport/Constants.java | 3 -
.../catalina/tribes/transport/DataSender.java | 12 -
.../tribes/transport/MultiPointSender.java | 3 -
.../catalina/tribes/transport/PooledSender.java | 10 -
.../catalina/tribes/transport/ReceiverBase.java | 10 -
.../tribes/transport/ReplicationTransmitter.java | 3 -
.../catalina/tribes/transport/RxTaskPool.java | 13 +-
.../catalina/tribes/transport/SenderState.java | 1 -
.../catalina/tribes/transport/bio/BioReceiver.java | 5 -
.../tribes/transport/bio/BioReplicationTask.java | 4 -
.../catalina/tribes/transport/bio/BioSender.java | 2 -
.../tribes/transport/bio/MultipointBioSender.java | 6 -
.../tribes/transport/bio/PooledMultiSender.java | 10 -
.../tribes/transport/bio/util/FastQueue.java | 2 -
.../tribes/transport/bio/util/LinkObject.java | 5 -
.../bio/util/SingleRemoveSynchronizedAddLock.java | 1 -
.../catalina/tribes/transport/nio/NioReceiver.java | 4 -
.../tribes/transport/nio/NioReplicationTask.java | 4 -
.../catalina/tribes/transport/nio/NioSender.java | 1 -
.../tribes/transport/nio/ParallelNioSender.java | 11 -
.../tribes/transport/nio/PooledParallelSender.java | 10 -
java/org/apache/catalina/tribes/util/Arrays.java | 1 -
java/org/apache/catalina/tribes/util/Logs.java | 1 -
.../apache/catalina/tribes/util/StringManager.java | 3 -
.../apache/catalina/tribes/util/UUIDGenerator.java | 1 -
java/org/apache/catalina/users/AbstractGroup.java | 2 -
java/org/apache/catalina/users/AbstractRole.java | 2 -
java/org/apache/catalina/users/AbstractUser.java | 2 -
java/org/apache/catalina/users/Constants.java | 2 -
java/org/apache/catalina/users/MemoryGroup.java | 2 -
java/org/apache/catalina/users/MemoryRole.java | 2 -
java/org/apache/catalina/users/MemoryUser.java | 2 -
.../apache/catalina/users/MemoryUserDatabase.java | 1 -
.../catalina/users/MemoryUserDatabaseFactory.java | 2 -
java/org/apache/catalina/util/CharsetMapper.java | 2 -
java/org/apache/catalina/util/ContextName.java | 15 +-
.../catalina/util/CustomObjectInputStream.java | 2 -
java/org/apache/catalina/util/Extension.java | 2 -
.../apache/catalina/util/ExtensionValidator.java | 2 -
java/org/apache/catalina/util/InstanceSupport.java | 2 -
.../org/apache/catalina/util/LifecycleSupport.java | 2 -
java/org/apache/catalina/util/MD5Encoder.java | 1 -
java/org/apache/catalina/util/MIME2Java.java | 1 -
.../org/apache/catalina/util/ManifestResource.java | 2 -
java/org/apache/catalina/util/ParameterMap.java | 1 -
java/org/apache/catalina/util/RequestUtil.java | 1 -
java/org/apache/catalina/util/ResourceSet.java | 2 -
java/org/apache/catalina/util/ServerInfo.java | 2 -
java/org/apache/catalina/util/Strftime.java | 1 -
java/org/apache/catalina/util/StringParser.java | 2 -
...ssLogValve.java => AbstractAccessLogValve.java} | 584 +-------
.../org/apache/catalina/valves/AccessLogValve.java | 1513 +-------------------
.../valves/CometConnectionManagerValve.java | 2 -
.../apache/catalina/valves/ErrorReportValve.java | 6 +-
.../catalina/valves/ExtendedAccessLogValve.java | 8 -
.../apache/catalina/valves/PersistentValve.java | 2 -
.../apache/catalina/valves/RemoteAddrValve.java | 1 -
.../apache/catalina/valves/RemoteHostValve.java | 1 -
java/org/apache/catalina/valves/RemoteIpValve.java | 4 +
.../apache/catalina/valves/RequestFilterValve.java | 1 -
.../org/apache/catalina/valves/SemaphoreValve.java | 2 -
java/org/apache/catalina/valves/ValveBase.java | 2 -
.../webresources/AbstractArchiveResourceSet.java | 18 +-
.../webresources/AbstractFileResourceSet.java | 11 +
.../catalina/webresources/AbstractResource.java | 4 +-
.../catalina/webresources/AbstractResourceSet.java | 2 +-
java/org/apache/catalina/webresources/Cache.java | 43 +-
.../catalina/webresources/CachedResource.java | 12 +-
.../catalina/webresources/DirResourceSet.java | 9 +-
.../apache/catalina/webresources/FileResource.java | 8 +-
.../catalina/webresources/FileResourceSet.java | 2 +-
.../catalina/webresources/LocalStrings.properties | 4 +-
.../apache/catalina/webresources/StandardRoot.java | 62 +-
...perInputStream.java => TrackedInputStream.java} | 10 +-
.../catalina/webresources/mbeans-descriptors.xml | 30 +-
java/org/apache/coyote/AbstractProtocol.java | 10 +-
java/org/apache/coyote/Constants.java | 11 +
...extCallback.java => ContainerThreadMarker.java} | 25 +-
java/org/apache/coyote/RequestInfo.java | 12 +
java/org/apache/coyote/Response.java | 14 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 1 -
java/org/apache/coyote/ajp/AjpNioProcessor.java | 7 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 1 -
.../apache/coyote/http11/Http11AprProtocol.java | 2 +-
.../apache/coyote/http11/Http11NioProcessor.java | 21 +-
.../apache/coyote/http11/Http11NioProtocol.java | 3 +-
java/org/apache/coyote/http11/Http11Processor.java | 1 -
.../coyote/http11/InternalNioInputBuffer.java | 1 -
.../coyote/http11/InternalNioOutputBuffer.java | 1 -
.../coyote/http11/filters/ChunkedInputFilter.java | 1 -
.../coyote/http11/upgrade/AbstractProcessor.java | 4 +-
.../http11/upgrade/AbstractServletInputStream.java | 4 +
.../upgrade/AbstractServletOutputStream.java | 37 +-
.../http11/upgrade/AprServletOutputStream.java | 19 +-
.../http11/upgrade/BioServletOutputStream.java | 7 +-
.../coyote/http11/upgrade/LocalStrings.properties | 2 +
.../http11/upgrade/NioServletOutputStream.java | 9 +-
java/org/apache/el/ExpressionFactoryImpl.java | 1 -
java/org/apache/el/MethodExpressionImpl.java | 1 -
java/org/apache/el/ValueExpressionImpl.java | 1 -
java/org/apache/el/lang/ELArithmetic.java | 1 -
java/org/apache/el/lang/ELSupport.java | 1 -
java/org/apache/el/lang/ExpressionBuilder.java | 1 -
java/org/apache/el/lang/FunctionMapperFactory.java | 1 -
java/org/apache/el/parser/ArithmeticNode.java | 1 -
java/org/apache/el/parser/AstAnd.java | 1 -
java/org/apache/el/parser/AstBracketSuffix.java | 1 -
java/org/apache/el/parser/AstChoice.java | 1 -
.../apache/el/parser/AstCompositeExpression.java | 1 -
.../apache/el/parser/AstDeferredExpression.java | 1 -
java/org/apache/el/parser/AstDiv.java | 1 -
java/org/apache/el/parser/AstDotSuffix.java | 1 -
.../org/apache/el/parser/AstDynamicExpression.java | 1 -
java/org/apache/el/parser/AstEmpty.java | 1 -
java/org/apache/el/parser/AstEqual.java | 1 -
java/org/apache/el/parser/AstFalse.java | 1 -
java/org/apache/el/parser/AstFloatingPoint.java | 1 -
java/org/apache/el/parser/AstFunction.java | 1 -
java/org/apache/el/parser/AstGreaterThan.java | 1 -
java/org/apache/el/parser/AstGreaterThanEqual.java | 1 -
java/org/apache/el/parser/AstIdentifier.java | 1 -
java/org/apache/el/parser/AstInteger.java | 1 -
java/org/apache/el/parser/AstLessThan.java | 1 -
java/org/apache/el/parser/AstLessThanEqual.java | 1 -
.../org/apache/el/parser/AstLiteralExpression.java | 1 -
java/org/apache/el/parser/AstMethodParameters.java | 3 -
java/org/apache/el/parser/AstMinus.java | 1 -
java/org/apache/el/parser/AstMod.java | 1 -
java/org/apache/el/parser/AstMult.java | 1 -
java/org/apache/el/parser/AstNegative.java | 1 -
java/org/apache/el/parser/AstNot.java | 1 -
java/org/apache/el/parser/AstNotEqual.java | 1 -
java/org/apache/el/parser/AstNull.java | 1 -
java/org/apache/el/parser/AstOr.java | 1 -
java/org/apache/el/parser/AstPlus.java | 1 -
java/org/apache/el/parser/AstString.java | 1 -
java/org/apache/el/parser/AstTrue.java | 1 -
java/org/apache/el/parser/AstValue.java | 1 -
java/org/apache/el/parser/BooleanNode.java | 1 -
java/org/apache/el/parser/Node.java | 1 -
java/org/apache/el/parser/NodeVisitor.java | 1 -
java/org/apache/el/parser/SimpleNode.java | 1 -
java/org/apache/el/util/MessageFactory.java | 1 -
java/org/apache/el/util/ReflectionUtil.java | 1 -
java/org/apache/jasper/JspC.java | 10 +-
java/org/apache/jasper/compiler/ELNode.java | 8 +-
java/org/apache/jasper/compiler/ELParser.java | 99 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 2 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 4 +-
.../apache/jasper/compiler/JspDocumentParser.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 1 -
java/org/apache/jasper/compiler/PageInfo.java | 11 +-
.../apache/jasper/compiler/TagPluginManager.java | 2 +-
java/org/apache/jasper/compiler/TldCache.java | 23 +-
java/org/apache/jasper/compiler/Validator.java | 2 +-
.../jasper/resources/LocalStrings.properties | 6 +-
.../jasper/resources/LocalStrings_es.properties | 3 +-
.../jasper/resources/LocalStrings_fr.properties | 2 -
.../jasper/resources/LocalStrings_ja.properties | 4 +-
.../jasper/runtime/InstanceManagerFactory.java | 3 -
.../org/apache/jasper/runtime/PageContextImpl.java | 4 +
.../apache/jasper/security/SecurityClassLoad.java | 2 -
java/org/apache/jasper/security/SecurityUtil.java | 2 -
.../apache/jasper/servlet/JasperInitializer.java | 2 +-
java/org/apache/jasper/servlet/JasperLoader.java | 1 -
.../apache/jasper/servlet/JspCServletContext.java | 2 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 2 -
java/org/apache/jasper/xmlparser/EncodingMap.java | 2 -
java/org/apache/jasper/xmlparser/SymbolTable.java | 1 -
java/org/apache/jasper/xmlparser/UCSReader.java | 2 -
java/org/apache/jasper/xmlparser/UTF8Reader.java | 2 -
java/org/apache/jasper/xmlparser/XMLChar.java | 2 -
java/org/apache/jasper/xmlparser/XMLString.java | 2 -
.../apache/jasper/xmlparser/XMLStringBuffer.java | 2 -
java/org/apache/juli/AsyncFileHandler.java | 3 -
java/org/apache/juli/ClassLoaderLogManager.java | 3 +-
java/org/apache/juli/DateFormatCache.java | 3 -
java/org/apache/juli/FileHandler.java | 3 -
java/org/apache/juli/logging/Log.java | 1 -
.../juli/logging/LogConfigurationException.java | 2 -
java/org/apache/juli/logging/LogFactory.java | 1 -
.../org/apache/naming/ContextAccessController.java | 2 -
java/org/apache/naming/ContextBindings.java | 2 -
java/org/apache/naming/EjbRef.java | 2 -
java/org/apache/naming/JndiPermission.java | 2 -
java/org/apache/naming/LocalStrings_es.properties | 2 +-
java/org/apache/naming/NameParserImpl.java | 2 -
java/org/apache/naming/NamingContext.java | 1 -
.../naming/NamingContextBindingsEnumeration.java | 2 -
.../apache/naming/NamingContextEnumeration.java | 2 -
java/org/apache/naming/NamingEntry.java | 1 -
java/org/apache/naming/ResourceEnvRef.java | 1 -
java/org/apache/naming/ResourceLinkRef.java | 1 -
java/org/apache/naming/ResourceRef.java | 2 -
java/org/apache/naming/SelectorContext.java | 2 -
java/org/apache/naming/StringManager.java | 3 -
java/org/apache/naming/TransactionRef.java | 2 -
.../naming/factory/DataSourceLinkFactory.java | 1 -
java/org/apache/naming/factory/EjbFactory.java | 1 -
.../apache/naming/factory/MailSessionFactory.java | 2 -
java/org/apache/naming/factory/OpenEjbFactory.java | 1 -
.../apache/naming/factory/ResourceEnvFactory.java | 2 -
.../org/apache/naming/factory/ResourceFactory.java | 2 -
.../apache/naming/factory/ResourceLinkFactory.java | 2 -
.../apache/naming/factory/TransactionFactory.java | 2 -
.../apache/naming/java/javaURLContextFactory.java | 2 -
java/org/apache/tomcat/InstanceManager.java | 3 -
java/org/apache/tomcat/jni/Address.java | 2 -
java/org/apache/tomcat/jni/BIOCallback.java | 2 -
java/org/apache/tomcat/jni/Buffer.java | 2 -
java/org/apache/tomcat/jni/Directory.java | 2 -
java/org/apache/tomcat/jni/Error.java | 2 -
java/org/apache/tomcat/jni/File.java | 3 +-
java/org/apache/tomcat/jni/FileInfo.java | 2 -
java/org/apache/tomcat/jni/Global.java | 2 -
java/org/apache/tomcat/jni/Library.java | 2 -
java/org/apache/tomcat/jni/Local.java | 2 -
java/org/apache/tomcat/jni/Lock.java | 2 -
java/org/apache/tomcat/jni/Mmap.java | 2 -
java/org/apache/tomcat/jni/Multicast.java | 2 -
java/org/apache/tomcat/jni/OS.java | 2 -
java/org/apache/tomcat/jni/PasswordCallback.java | 2 -
java/org/apache/tomcat/jni/Poll.java | 1 -
java/org/apache/tomcat/jni/Pool.java | 2 -
java/org/apache/tomcat/jni/PoolCallback.java | 2 -
java/org/apache/tomcat/jni/Proc.java | 2 -
java/org/apache/tomcat/jni/ProcErrorCallback.java | 2 -
java/org/apache/tomcat/jni/Procattr.java | 2 -
java/org/apache/tomcat/jni/Registry.java | 2 -
java/org/apache/tomcat/jni/SSL.java | 1 -
java/org/apache/tomcat/jni/SSLContext.java | 2 -
java/org/apache/tomcat/jni/SSLSocket.java | 2 -
java/org/apache/tomcat/jni/Shm.java | 2 -
java/org/apache/tomcat/jni/Sockaddr.java | 2 -
java/org/apache/tomcat/jni/Socket.java | 2 -
java/org/apache/tomcat/jni/Status.java | 2 -
java/org/apache/tomcat/jni/Stdlib.java | 2 -
java/org/apache/tomcat/jni/Thread.java | 2 -
java/org/apache/tomcat/jni/Time.java | 2 -
java/org/apache/tomcat/jni/User.java | 2 -
java/org/apache/tomcat/util/bcel/Constants.java | 1 -
.../tomcat/util/bcel/classfile/AccessFlags.java | 1 -
.../util/bcel/classfile/AnnotationDefault.java | 1 -
.../util/bcel/classfile/AnnotationEntry.java | 1 -
.../tomcat/util/bcel/classfile/Annotations.java | 1 -
.../tomcat/util/bcel/classfile/Attribute.java | 1 -
.../util/bcel/classfile/ClassFormatException.java | 1 -
.../tomcat/util/bcel/classfile/ClassParser.java | 1 -
.../apache/tomcat/util/bcel/classfile/Code.java | 1 -
.../tomcat/util/bcel/classfile/Constant.java | 1 -
.../tomcat/util/bcel/classfile/ConstantCP.java | 1 -
.../tomcat/util/bcel/classfile/ConstantClass.java | 1 -
.../tomcat/util/bcel/classfile/ConstantDouble.java | 1 -
.../util/bcel/classfile/ConstantFieldref.java | 1 -
.../tomcat/util/bcel/classfile/ConstantFloat.java | 1 -
.../util/bcel/classfile/ConstantInteger.java | 1 -
.../bcel/classfile/ConstantInterfaceMethodref.java | 1 -
.../tomcat/util/bcel/classfile/ConstantLong.java | 1 -
.../util/bcel/classfile/ConstantMethodref.java | 1 -
.../util/bcel/classfile/ConstantNameAndType.java | 1 -
.../tomcat/util/bcel/classfile/ConstantPool.java | 1 -
.../tomcat/util/bcel/classfile/ConstantString.java | 1 -
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 1 -
.../tomcat/util/bcel/classfile/ConstantValue.java | 1 -
.../tomcat/util/bcel/classfile/Deprecated.java | 1 -
.../tomcat/util/bcel/classfile/ElementValue.java | 1 -
.../util/bcel/classfile/ElementValuePair.java | 1 -
.../tomcat/util/bcel/classfile/ExceptionTable.java | 1 -
.../tomcat/util/bcel/classfile/FieldOrMethod.java | 1 -
.../tomcat/util/bcel/classfile/InnerClasses.java | 1 -
.../tomcat/util/bcel/classfile/JavaClass.java | 1 -
.../util/bcel/classfile/LineNumberTable.java | 1 -
.../util/bcel/classfile/LocalVariableTable.java | 1 -
.../tomcat/util/bcel/classfile/PMGClass.java | 1 -
.../bcel/classfile/ParameterAnnotationEntry.java | 1 -
.../util/bcel/classfile/ParameterAnnotations.java | 1 -
.../classfile/RuntimeInvisibleAnnotations.java | 1 -
.../RuntimeInvisibleParameterAnnotations.java | 1 -
.../bcel/classfile/RuntimeVisibleAnnotations.java | 1 -
.../RuntimeVisibleParameterAnnotations.java | 1 -
.../tomcat/util/bcel/classfile/SourceFile.java | 1 -
.../apache/tomcat/util/bcel/classfile/Utility.java | 1 -
.../apache/tomcat/util/bcel/classfile/package.html | 3 -
java/org/apache/tomcat/util/bcel/package.html | 3 -
.../tomcat/util/bcel/util/BCELComparator.java | 1 -
java/org/apache/tomcat/util/bcel/util/package.html | 3 -
.../apache/tomcat/util/codec/BinaryDecoder.java | 2 -
.../apache/tomcat/util/codec/BinaryEncoder.java | 2 -
java/org/apache/tomcat/util/codec/Decoder.java | 2 -
.../apache/tomcat/util/codec/DecoderException.java | 2 -
java/org/apache/tomcat/util/codec/Encoder.java | 2 -
.../apache/tomcat/util/codec/EncoderException.java | 2 -
.../apache/tomcat/util/codec/binary/Base64.java | 1 -
.../tomcat/util/codec/binary/BaseNCodec.java | 2 -
.../tomcat/util/codec/binary/StringUtils.java | 1 -
.../tomcat/util/descriptor/XmlErrorHandler.java | 12 +-
.../util/descriptor/web/ApplicationParameter.java | 2 -
.../tomcat/util/descriptor/web/ContextEjb.java | 1 -
.../util/descriptor/web/ContextEnvironment.java | 1 -
.../util/descriptor/web/ContextLocalEjb.java | 1 -
.../util/descriptor/web/ContextResource.java | 1 -
.../util/descriptor/web/ContextResourceEnvRef.java | 1 -
.../util/descriptor/web/ContextResourceLink.java | 1 -
.../tomcat/util/descriptor/web/ContextService.java | 1 -
.../util/descriptor/web/ContextTransaction.java | 2 -
.../tomcat/util/descriptor/web/ErrorPage.java | 2 -
.../tomcat/util/descriptor/web/FilterDef.java | 2 -
.../tomcat/util/descriptor/web/FilterMap.java | 2 -
.../util/descriptor/web/InjectionTarget.java | 3 -
.../tomcat/util/descriptor/web/LoginConfig.java | 2 -
.../util/descriptor/web/MessageDestination.java | 1 -
.../util/descriptor/web/MessageDestinationRef.java | 1 -
.../tomcat/util/descriptor/web/ResourceBase.java | 1 -
.../util/descriptor/web/SecurityCollection.java | 2 -
.../util/descriptor/web/SecurityConstraint.java | 2 -
.../util/descriptor/web/SecurityRoleRef.java | 3 -
.../tomcat/util/descriptor/web/WebRuleSet.java | 19 +-
java/org/apache/tomcat/util/file/package.html | 3 -
.../org/apache/tomcat/util/http/CookieSupport.java | 53 -
java/org/apache/tomcat/util/http/ServerCookie.java | 218 +--
.../{ServerCookie.java => SetCookieSupport.java} | 223 ++-
.../http/fileupload/ByteArrayOutputStream.java | 2 -
.../http/fileupload/DeferredFileOutputStream.java | 2 -
.../tomcat/util/http/fileupload/FileItem.java | 1 -
.../util/http/fileupload/FileItemFactory.java | 2 -
.../util/http/fileupload/FileItemHeaders.java | 2 -
.../http/fileupload/FileItemHeadersSupport.java | 2 -
.../util/http/fileupload/FileItemIterator.java | 2 -
.../util/http/fileupload/FileItemStream.java | 2 -
.../tomcat/util/http/fileupload/FileUpload.java | 2 -
.../util/http/fileupload/FileUploadBase.java | 20 +-
.../tomcat/util/http/fileupload/FileUtils.java | 2 -
.../tomcat/util/http/fileupload/IOUtils.java | 2 -
.../http/fileupload/InvalidFileNameException.java | 2 -
.../util/http/fileupload/MultipartStream.java | 15 +-
.../util/http/fileupload/ParameterParser.java | 2 -
.../util/http/fileupload/ProgressListener.java | 2 -
.../util/http/fileupload/RequestContext.java | 2 -
.../http/fileupload/ThresholdingOutputStream.java | 2 -
.../util/http/fileupload/disk/DiskFileItem.java | 2 -
.../http/fileupload/disk/DiskFileItemFactory.java | 2 -
.../http/fileupload/servlet/ServletFileUpload.java | 2 -
.../fileupload/servlet/ServletRequestContext.java | 2 -
.../util/http/fileupload/util/Closeable.java | 2 -
.../http/fileupload/util/FileItemHeadersImpl.java | 2 -
.../http/fileupload/util/LimitedInputStream.java | 2 -
.../tomcat/util/http/fileupload/util/Streams.java | 2 -
.../tomcat/util/modeler/BaseAttributeFilter.java | 2 -
.../apache/tomcat/util/modeler/FeatureInfo.java | 2 -
.../apache/tomcat/util/modeler/ManagedBean.java | 2 -
.../tomcat/util/modeler/NotificationInfo.java | 1 -
.../apache/tomcat/util/modeler/ParameterInfo.java | 2 -
.../tomcat/util/modeler/mbeans-descriptors.dtd | 2 -
.../apache/tomcat/util/net/AbstractEndpoint.java | 30 +-
java/org/apache/tomcat/util/net/NioChannel.java | 1 -
java/org/apache/tomcat/util/net/NioEndpoint.java | 1 -
.../apache/tomcat/util/net/NioSelectorPool.java | 1 -
.../apache/tomcat/util/net/SSLSessionManager.java | 2 -
.../apache/tomcat/util/net/SecureNioChannel.java | 1 -
.../apache/tomcat/util/net/SocketProperties.java | 2 -
java/org/apache/tomcat/util/net/SocketWrapper.java | 12 +-
java/org/apache/tomcat/util/net/URL.java | 2 -
.../tomcat/util/net/jsse/JSSESocketFactory.java | 1 -
.../apache/tomcat/util/net/jsse/JSSESupport.java | 1 -
java/org/apache/tomcat/util/res/StringManager.java | 3 -
java/org/apache/tomcat/util/scan/package.html | 3 -
java/org/apache/tomcat/util/threads/TaskQueue.java | 11 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 1 -
.../tomcat/websocket/LocalStrings.properties | 1 +
java/org/apache/tomcat/websocket/WsFrameBase.java | 18 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 1 +
java/org/apache/tomcat/websocket/WsSession.java | 12 +-
.../tomcat/websocket/WsWebSocketContainer.java | 2 +-
.../tomcat/websocket/pojo/PojoEndpointBase.java | 10 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 8 +
.../tomcat/websocket/server/UpgradeUtil.java | 35 +-
.../server/WsRemoteEndpointImplServer.java | 5 +
.../java/org/apache/cometd/bayeux/Bayeux.java | 1 -
.../java/org/apache/cometd/bayeux/Channel.java | 1 -
.../java/org/apache/cometd/bayeux/Client.java | 1 -
.../java/org/apache/cometd/bayeux/DataFilter.java | 1 -
.../java/org/apache/cometd/bayeux/Listener.java | 1 -
.../java/org/apache/cometd/bayeux/Message.java | 1 -
.../org/apache/tomcat/bayeux/BayeuxException.java | 1 -
.../org/apache/tomcat/bayeux/BayeuxRequest.java | 1 -
.../org/apache/tomcat/bayeux/BayeuxServlet.java | 1 -
.../java/org/apache/tomcat/bayeux/ChannelImpl.java | 1 -
.../java/org/apache/tomcat/bayeux/RequestBase.java | 1 -
.../org/apache/tomcat/bayeux/TomcatBayeux.java | 1 -
.../tomcat/bayeux/request/MetaConnectRequest.java | 1 -
.../bayeux/request/MetaDisconnectRequest.java | 1 -
.../bayeux/request/MetaHandshakeRequest.java | 1 -
.../bayeux/request/MetaSubscribeRequest.java | 1 -
.../bayeux/request/MetaUnsubscribeRequest.java | 1 -
.../tomcat/bayeux/request/PublishRequest.java | 1 -
modules/jdbc-pool/NOTICE | 2 +-
modules/jdbc-pool/build.properties.default | 2 -
modules/jdbc-pool/doc/package.xsl | 4 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 3 -
.../org/apache/tomcat/jdbc/pool/DataSource.java | 1 -
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 1 -
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 1 -
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 1 -
.../apache/tomcat/jdbc/pool/JdbcInterceptor.java | 1 -
.../jdbc/pool/MultiLockFairBlockingQueue.java | 1 -
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 1 -
.../apache/tomcat/jdbc/pool/PoolProperties.java | 5 -
.../org/apache/tomcat/jdbc/pool/PoolUtilities.java | 5 -
.../apache/tomcat/jdbc/pool/PooledConnection.java | 1 -
.../apache/tomcat/jdbc/pool/ProxyConnection.java | 1 -
.../org/apache/tomcat/jdbc/pool/TrapException.java | 1 -
.../AbstractCreateStatementInterceptor.java | 1 -
.../jdbc/pool/interceptor/AbstractQueryReport.java | 2 -
.../jdbc/pool/interceptor/ConnectionState.java | 1 -
.../jdbc/pool/interceptor/ResetAbandonedTimer.java | 1 -
.../jdbc/pool/interceptor/SlowQueryReport.java | 6 -
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 1 -
.../interceptor/StatementDecoratorInterceptor.java | 5 +-
.../jdbc/pool/interceptor/StatementFinalizer.java | 1 -
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 4 +-
.../jdbc/pool/interceptor/InduceSlowQuery.java | 4 -
.../apache/tomcat/jdbc/test/DefaultProperties.java | 1 -
.../apache/tomcat/jdbc/test/DefaultTestCase.java | 1 -
res/META-INF/servlet-api.jar.license | 2 +
res/META-INF/servlet-api.jar.notice | 2 +
res/maven/README.txt | 2 -
res/maven/mvn-pub.xml | 11 +-
res/maven/mvn.properties.default | 2 +-
...-embed-logging-juli.pom => tomcat-embed-el.pom} | 4 +-
res/maven/tomcat-embed-jasper.pom | 6 +
...embed-jasper.pom => tomcat-embed-websocket.pom} | 7 +-
res/scripts/check-mime.pl | 2 -
res/side_left.bmp | Bin 345238 -> 345238 bytes
res/tomcat.nsi | 1 -
test/javax/el/TestBeanELResolver.java | 1 -
test/javax/el/TestBeanNameELResolver.java | 1 -
test/javax/el/TestStaticFieldELResolver.java | 1 -
test/javax/servlet/http/TestCookie.java | 161 +++
.../http/TestCookieStrict.java} | 31 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 585 ++++++--
.../catalina/core/TestDefaultInstanceManager.java | 3 +
.../apache/catalina/core/TestStandardContext.java | 16 +
test/org/apache/catalina/core/TesterContext.java | 26 +-
.../apache/catalina/filters/TestExpiresFilter.java | 1 -
.../startup/DuplicateMappingParamFilter.java | 1 -
.../startup/DuplicateMappingParamServlet.java | 1 -
.../catalina/startup/NoMappingParamServlet.java | 1 -
test/org/apache/catalina/startup/ParamFilter.java | 1 -
test/org/apache/catalina/startup/ParamServlet.java | 1 -
.../apache/catalina/startup/TestContextConfig.java | 2 +-
.../startup/TestContextConfigAnnotation.java | 1 -
.../startup/TestHostConfigAutomaticDeployment.java | 5 +-
.../catalina/startup/TestWebappServiceLoader.java | 14 +-
...terServlet.java => TesterServletEncodeUrl.java} | 22 +-
.../startup/TesterServletWithAnnotations.java | 12 +
.../catalina/tribes/demos/ChannelCreator.java | 1 -
.../apache/catalina/tribes/demos/EchoRpcTest.java | 11 -
.../org/apache/catalina/tribes/demos/LoadTest.java | 11 -
test/org/apache/catalina/tribes/demos/MapDemo.java | 1 -
.../tribes/group/TestGroupChannelOptionFlag.java | 10 -
.../tribes/group/TestGroupChannelStartStop.java | 1 -
.../group/interceptors/TestTcpFailureDetector.java | 10 -
.../membership/TestMemberImplSerialization.java | 10 -
.../apache/catalina/tribes/test/NioSenderTest.java | 10 -
.../tribes/test/channel/TestDataIntegrity.java | 10 -
.../test/channel/TestRemoteProcessException.java | 10 -
test/org/apache/catalina/util/TestContextName.java | 66 +-
.../catalina/valves/TestErrorReportValve.java | 49 +
.../catalina/valves/TesterAccessLogValve.java | 4 +-
...rceSet.java => AbstractTestDirResourceSet.java} | 11 +-
...ceSet.java => AbstractTestFileResourceSet.java} | 15 +-
.../catalina/webresources/TestDirResourceSet.java | 37 +-
.../webresources/TestDirResourceSetReadOnly.java | 6 +-
.../catalina/webresources/TestFileResourceSet.java | 56 +-
.../webresources/TestFileResourceSetReadOnly.java | 8 +-
.../webresources/TesterWebResourceRoot.java | 4 +-
.../coyote/http11/TestAbstractHttp11Processor.java | 2 +-
.../apache/coyote/http11/upgrade/TestUpgrade.java | 218 ++-
test/org/apache/el/TestELInJsp.java | 30 +
test/org/apache/jasper/compiler/TestELParser.java | 66 +
.../apache/jasper/runtime/TestPageContextImpl.java | 49 +
.../org/apache/juli/TestClassLoaderLogManager.java | 108 +-
.../apache/naming/resources/TestWarDirContext.java | 9 +-
test/org/apache/tomcat/util/http/TestCookies.java | 367 ++---
.../tomcat/util/http/TestSetCookieSupport.java | 204 +++
.../TestSetCookieSupportSeparatorsAllowed.java | 194 +++
.../tomcat/websocket/TestWebSocketFrameClient.java | 73 +
.../tomcat/websocket/TesterFirehoseServer.java | 33 +-
.../tomcat/websocket/TesterMessageCountClient.java | 18 +
test/webapp-fragments/WEB-INF/web.xml | 10 +
.../bug5nnnn/{bug54821a.jspx => bug56029.jspx} | 13 +-
webapps/ROOT/index.jsp | 8 +-
webapps/docs/appdev/build.xml.txt | 2 -
webapps/docs/changelog.xml | 146 +-
webapps/docs/config/ajp.xml | 11 +-
webapps/docs/config/context.xml | 51 +-
webapps/docs/config/filter.xml | 3 +
webapps/docs/config/http.xml | 14 +-
webapps/docs/config/jar-scan-filter.xml | 7 +
webapps/docs/config/listeners.xml | 4 +-
webapps/docs/config/realm.xml | 13 +-
webapps/docs/config/resources.xml | 87 +-
webapps/docs/config/valve.xml | 3 +
webapps/docs/funcspecs/fs-admin-apps.xml | 1 -
webapps/docs/funcspecs/fs-admin-objects.xml | 1 -
webapps/docs/funcspecs/fs-admin-opers.xml | 1 -
webapps/docs/funcspecs/fs-default.xml | 1 -
webapps/docs/funcspecs/fs-jdbc-realm.xml | 1 -
webapps/docs/funcspecs/fs-jndi-realm.xml | 1 -
webapps/docs/funcspecs/fs-memory-realm.xml | 1 -
webapps/docs/funcspecs/mbean-names.xml | 1 -
webapps/docs/security-howto.xml | 3 -
webapps/docs/tomcat-docs.xsl | 2 -
.../examples/WEB-INF/classes/CookieExample.java | 3 -
.../WEB-INF/classes/LocalStrings.properties | 2 -
.../WEB-INF/classes/LocalStrings_en.properties | 2 -
.../WEB-INF/classes/LocalStrings_fr.properties | 2 -
.../WEB-INF/classes/LocalStrings_pt.properties | 2 -
.../WEB-INF/classes/RequestHeaderExample.java | 3 -
.../WEB-INF/classes/RequestInfoExample.java | 3 -
.../WEB-INF/classes/RequestParamExample.java | 3 -
.../examples/WEB-INF/classes/SessionExample.java | 3 -
.../WEB-INF/classes/filters/ExampleFilter.java | 2 -
.../WEB-INF/classes/listeners/ContextListener.java | 2 -
.../WEB-INF/classes/listeners/SessionListener.java | 2 -
.../examples/WEB-INF/classes/util/HTMLFilter.java | 2 -
.../WEB-INF/classes/validators/DebugValidator.java | 2 -
webapps/host-manager/manager.xml | 4 -
webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
922 files changed, 3949 insertions(+), 5921 deletions(-)
copy java/org/apache/catalina/{WebResourceTraceWrapper.java => ThreadBindingListener.java} (77%)
rename java/org/apache/catalina/{WebResourceTraceWrapper.java => TrackedWebResource.java} (93%)
copy java/org/apache/catalina/valves/{AccessLogValve.java => AbstractAccessLogValve.java} (76%)
rename java/org/apache/catalina/webresources/{TraceWrapperInputStream.java => TrackedInputStream.java} (89%)
copy java/org/apache/coyote/{AsyncContextCallback.java => ContainerThreadMarker.java} (67%)
copy java/org/apache/tomcat/util/http/{ServerCookie.java => SetCookieSupport.java} (56%)
copy res/maven/{tomcat-embed-logging-juli.pom => tomcat-embed-el.pom} (90%)
copy res/maven/{tomcat-embed-jasper.pom => tomcat-embed-websocket.pom} (88%)
create mode 100644 test/javax/servlet/http/TestCookie.java
copy test/javax/{el/TestUtil.java => servlet/http/TestCookieStrict.java} (54%)
copy test/org/apache/catalina/startup/{TesterServlet.java => TesterServletEncodeUrl.java} (63%)
copy test/org/apache/catalina/webresources/{TestDirResourceSet.java => AbstractTestDirResourceSet.java} (85%)
copy test/org/apache/catalina/webresources/{TestFileResourceSet.java => AbstractTestFileResourceSet.java} (84%)
copy java/org/apache/catalina/webresources/Constants.java => test/org/apache/catalina/webresources/TestDirResourceSetReadOnly.java (85%)
copy java/org/apache/catalina/webresources/Constants.java => test/org/apache/catalina/webresources/TestFileResourceSetReadOnly.java (84%)
create mode 100644 test/org/apache/tomcat/util/http/TestSetCookieSupport.java
create mode 100644 test/org/apache/tomcat/util/http/TestSetCookieSupportSeparatorsAllowed.java
copy test/webapp/bug5nnnn/{bug54821a.jspx => bug56029.jspx} (66%)
--
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