[tomcat6] branch master updated (7752cf8 -> 4fb04b2)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri May 23 19:49:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat6.
from 7752cf8 New upstream release (6.0.39) Refreshed the patches
new bf1ccf9 Added myself to the uploaders
adds 5415b37 Imported Upstream version 6.0.41
new 9b8b51b Merge tag 'upstream/6.0.41'
new 4fb04b2 Refreshed the patches
The 3 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:
STATUS.txt | 26 -
bin/service.bat | 131 ++--
build.properties.default | 4 +-
build.xml | 4 -
conf/catalina.properties | 6 +-
conf/web.xml | 10 +-
debian/changelog | 7 +
debian/control | 3 +-
...-deploy-webapps-target-from-deploy-target.patch | 6 +-
.../0006-add-JARs-below-var-to-class-loader.patch | 9 +-
extras.xml | 1 -
java/javax/servlet/GenericServlet.java | 2 +-
java/javax/servlet/RequestDispatcher.java | 2 +-
java/javax/servlet/Servlet.java | 2 +-
java/javax/servlet/ServletContext.java | 2 +-
java/javax/servlet/ServletException.java | 2 +-
java/javax/servlet/ServletInputStream.java | 2 +-
java/javax/servlet/ServletOutputStream.java | 2 +-
java/javax/servlet/ServletRequest.java | 2 +-
java/javax/servlet/ServletResponse.java | 2 +-
java/javax/servlet/ServletResponseWrapper.java | 2 +-
java/javax/servlet/SingleThreadModel.java | 2 +-
java/javax/servlet/UnavailableException.java | 2 +-
java/javax/servlet/http/Cookie.java | 2 +-
java/javax/servlet/http/HttpServlet.java | 2 +-
java/javax/servlet/http/HttpServletResponse.java | 2 +-
.../servlet/http/HttpServletResponseWrapper.java | 2 +-
java/javax/servlet/http/HttpSession.java | 2 +-
.../servlet/http/HttpSessionBindingEvent.java | 2 +-
.../servlet/http/HttpSessionBindingListener.java | 2 +-
java/javax/servlet/http/HttpSessionContext.java | 2 +-
java/javax/servlet/http/LocalStrings_es.properties | 2 -
java/javax/servlet/jsp/JspFactory.java | 9 +-
java/javax/servlet/jsp/resources/jsp_2_0.xsd | 6 -
.../jsp/resources/web-jsptaglibrary_2_0.xsd | 6 -
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 -
.../servlet/resources/javaee_web_services_1_2.xsd | 6 -
.../resources/javaee_web_services_client_1_2.xsd | 6 -
java/javax/servlet/resources/web-app_2_4.xsd | 6 -
java/javax/servlet/resources/web-app_2_5.xsd | 5 -
java/org/apache/AnnotationProcessor.java | 2 +-
java/org/apache/catalina/Authenticator.java | 2 +-
java/org/apache/catalina/Cluster.java | 2 +-
java/org/apache/catalina/Contained.java | 2 +-
java/org/apache/catalina/Container.java | 2 +-
java/org/apache/catalina/ContainerEvent.java | 2 +-
java/org/apache/catalina/ContainerListener.java | 2 +-
java/org/apache/catalina/ContainerServlet.java | 2 +-
java/org/apache/catalina/Context.java | 2 +-
java/org/apache/catalina/Engine.java | 2 +-
java/org/apache/catalina/Globals.java | 12 +-
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 | 2 +-
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 | 2 +-
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/ServerFactory.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 +-
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/Wrapper.java | 2 +-
.../apache/catalina/ant/AbstractCatalinaTask.java | 2 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 2 +-
java/org/apache/catalina/ant/DeployTask.java | 2 +-
java/org/apache/catalina/ant/InstallTask.java | 2 +-
.../apache/catalina/ant/JKStatusUpdateTask.java | 2 +-
java/org/apache/catalina/ant/JMXGetTask.java | 2 +-
java/org/apache/catalina/ant/JMXQueryTask.java | 2 +-
java/org/apache/catalina/ant/JMXSetTask.java | 2 +-
java/org/apache/catalina/ant/ListTask.java | 2 +-
java/org/apache/catalina/ant/ReloadTask.java | 2 +-
java/org/apache/catalina/ant/RemoveTask.java | 2 +-
java/org/apache/catalina/ant/ResourcesTask.java | 2 +-
java/org/apache/catalina/ant/RolesTask.java | 2 +-
java/org/apache/catalina/ant/ServerinfoTask.java | 2 +-
java/org/apache/catalina/ant/SessionsTask.java | 2 +-
java/org/apache/catalina/ant/StartTask.java | 2 +-
java/org/apache/catalina/ant/StopTask.java | 2 +-
java/org/apache/catalina/ant/UndeployTask.java | 2 +-
java/org/apache/catalina/ant/ValidatorTask.java | 2 +-
java/org/apache/catalina/ant/jmx/Arg.java | 2 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 2 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 2 +-
.../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 | 2 +-
.../catalina/authenticator/AuthenticatorBase.java | 2 +-
.../catalina/authenticator/BasicAuthenticator.java | 2 +-
.../authenticator/DigestAuthenticator.java | 2 +-
.../catalina/authenticator/FormAuthenticator.java | 2 +-
.../authenticator/NonLoginAuthenticator.java | 2 +-
.../catalina/authenticator/SSLAuthenticator.java | 2 +-
.../catalina/authenticator/SavedRequest.java | 2 +-
.../catalina/authenticator/SingleSignOn.java | 2 +-
.../catalina/authenticator/SingleSignOnEntry.java | 2 +-
.../catalina/connector/ClientAbortException.java | 2 +-
java/org/apache/catalina/connector/Connector.java | 2 +-
.../apache/catalina/connector/CoyoteAdapter.java | 2 +-
.../apache/catalina/connector/CoyotePrincipal.java | 2 +-
java/org/apache/catalina/connector/Request.java | 2 +-
.../apache/catalina/connector/RequestFacade.java | 2 +-
java/org/apache/catalina/connector/Response.java | 2 +-
.../apache/catalina/connector/ResponseFacade.java | 2 +-
.../apache/catalina/core/ApplicationContext.java | 15 +-
.../catalina/core/ApplicationContextFacade.java | 2 +-
.../catalina/core/ApplicationDispatcher.java | 2 +-
.../catalina/core/ApplicationFilterChain.java | 2 +-
.../catalina/core/ApplicationFilterConfig.java | 89 +--
.../catalina/core/ApplicationFilterFactory.java | 2 +-
.../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 | 108 ++-
java/org/apache/catalina/core/DummyRequest.java | 2 +-
java/org/apache/catalina/core/DummyResponse.java | 2 +-
java/org/apache/catalina/core/JasperListener.java | 2 +-
.../apache/catalina/core/LocalStrings.properties | 6 +
.../catalina/core/NamingContextListener.java | 6 +-
java/org/apache/catalina/core/StandardContext.java | 4 +-
.../apache/catalina/core/StandardContextValve.java | 2 +-
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 | 2 +-
java/org/apache/catalina/core/StandardServer.java | 2 +-
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
.../catalina/core/StandardWrapperFacade.java | 2 +-
.../apache/catalina/core/StandardWrapperValve.java | 2 +-
.../catalina/deploy/ApplicationParameter.java | 2 +-
java/org/apache/catalina/deploy/ContextEjb.java | 2 +-
.../apache/catalina/deploy/ContextEnvironment.java | 2 +-
.../apache/catalina/deploy/ContextLocalEjb.java | 2 +-
.../apache/catalina/deploy/ContextResource.java | 2 +-
.../catalina/deploy/ContextResourceEnvRef.java | 2 +-
.../catalina/deploy/ContextResourceLink.java | 2 +-
.../org/apache/catalina/deploy/ContextService.java | 2 +-
.../apache/catalina/deploy/ContextTransaction.java | 2 +-
java/org/apache/catalina/deploy/ErrorPage.java | 2 +-
java/org/apache/catalina/deploy/FilterDef.java | 2 +-
java/org/apache/catalina/deploy/FilterMap.java | 2 +-
java/org/apache/catalina/deploy/LoginConfig.java | 2 +-
.../apache/catalina/deploy/MessageDestination.java | 2 +-
.../catalina/deploy/MessageDestinationRef.java | 2 +-
.../apache/catalina/deploy/NamingResources.java | 2 +-
java/org/apache/catalina/deploy/ResourceBase.java | 2 +-
.../apache/catalina/deploy/SecurityCollection.java | 2 +-
.../apache/catalina/deploy/SecurityConstraint.java | 2 +-
.../apache/catalina/deploy/SecurityRoleRef.java | 2 +-
java/org/apache/catalina/ha/CatalinaCluster.java | 2 +-
java/org/apache/catalina/ha/ClusterDeployer.java | 2 +-
java/org/apache/catalina/ha/ClusterListener.java | 2 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 2 +-
java/org/apache/catalina/ha/ClusterValve.java | 2 +-
java/org/apache/catalina/ha/Constants.java | 2 +-
.../catalina/ha/context/ReplicatedContext.java | 70 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 2 +-
.../catalina/ha/session/ClusterManagerBase.java | 2 +-
.../ha/session/ClusterSessionListener.java | 2 +-
.../apache/catalina/ha/session/DeltaManager.java | 2 +-
.../apache/catalina/ha/session/DeltaSession.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../session/JvmRouteSessionIDBinderListener.java | 2 +-
.../catalina/ha/session/ReplicatedSession.java | 2 +-
.../catalina/ha/session/SerializablePrincipal.java | 2 +-
.../catalina/ha/session/SessionIDMessage.java | 2 +-
.../catalina/ha/session/SessionMessageImpl.java | 2 +-
java/org/apache/catalina/ha/tcp/Constants.java | 2 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 2 +-
.../apache/catalina/ha/tcp/SendMessageData.java | 2 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
.../apache/catalina/ha/util/IDynamicProperty.java | 2 +-
java/org/apache/catalina/loader/Reloader.java | 2 +-
java/org/apache/catalina/loader/ResourceEntry.java | 2 +-
.../catalina/loader/StandardClassLoader.java | 2 +-
.../catalina/loader/StandardClassLoaderMBean.java | 2 +-
.../catalina/loader/VirtualWebappLoader.java | 2 +-
.../apache/catalina/loader/WebappClassLoader.java | 2 +-
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 2 +-
.../apache/catalina/manager/ManagerServlet.java | 2 +-
.../catalina/manager/StatusManagerServlet.java | 2 +-
.../apache/catalina/manager/StatusTransformer.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 +-
.../catalina/mbeans/DefaultContextMBean.java | 2 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 2 +-
java/org/apache/catalina/mbeans/GroupMBean.java | 2 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 +-
java/org/apache/catalina/mbeans/MBeanUtils.java | 2 +-
.../catalina/mbeans/MemoryUserDatabaseMBean.java | 2 +-
.../catalina/mbeans/NamingResourcesMBean.java | 2 +-
java/org/apache/catalina/mbeans/RoleMBean.java | 2 +-
.../catalina/mbeans/ServerLifecycleListener.java | 2 +-
.../catalina/mbeans/StandardContextMBean.java | 2 +-
.../catalina/mbeans/StandardEngineMBean.java | 2 +-
.../apache/catalina/mbeans/StandardHostMBean.java | 2 +-
.../catalina/mbeans/StandardServerMBean.java | 2 +-
.../catalina/mbeans/StandardServiceMBean.java | 2 +-
java/org/apache/catalina/mbeans/UserMBean.java | 2 +-
java/org/apache/catalina/realm/Constants.java | 2 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 2 +-
.../apache/catalina/realm/GenericPrincipal.java | 2 +-
.../apache/catalina/realm/JAASCallbackHandler.java | 2 +-
.../catalina/realm/JAASMemoryLoginModule.java | 2 +-
java/org/apache/catalina/realm/JAASRealm.java | 2 +-
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 | 34 +-
java/org/apache/catalina/servlets/CGIServlet.java | 6 +-
.../apache/catalina/servlets/DefaultServlet.java | 296 ++++++--
.../catalina/servlets/InvokerHttpRequest.java | 2 +-
.../apache/catalina/servlets/InvokerServlet.java | 2 +-
.../catalina/servlets/LocalStrings.properties | 3 +
.../apache/catalina/servlets/WebdavServlet.java | 2 +-
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 | 2 +-
.../apache/catalina/session/StandardManager.java | 2 +-
.../apache/catalina/session/StandardSession.java | 22 +-
.../catalina/session/StandardSessionFacade.java | 2 +-
java/org/apache/catalina/session/StoreBase.java | 2 +-
.../catalina/ssi/ByteArrayServletOutputStream.java | 2 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 2 +-
.../apache/catalina/ssi/ExpressionTokenizer.java | 2 +-
.../catalina/ssi/ResponseIncludeWrapper.java | 2 +-
java/org/apache/catalina/ssi/SSICommand.java | 2 +-
java/org/apache/catalina/ssi/SSIConditional.java | 2 +-
.../apache/catalina/ssi/SSIConditionalState.java | 2 +-
java/org/apache/catalina/ssi/SSIConfig.java | 2 +-
java/org/apache/catalina/ssi/SSIEcho.java | 2 +-
java/org/apache/catalina/ssi/SSIExec.java | 2 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 2 +-
java/org/apache/catalina/ssi/SSIFilter.java | 2 +-
java/org/apache/catalina/ssi/SSIFlastmod.java | 2 +-
java/org/apache/catalina/ssi/SSIFsize.java | 2 +-
java/org/apache/catalina/ssi/SSIInclude.java | 2 +-
java/org/apache/catalina/ssi/SSIMediator.java | 2 +-
java/org/apache/catalina/ssi/SSIPrintenv.java | 2 +-
java/org/apache/catalina/ssi/SSIProcessor.java | 2 +-
java/org/apache/catalina/ssi/SSIServlet.java | 2 +-
.../catalina/ssi/SSIServletExternalResolver.java | 2 +-
java/org/apache/catalina/ssi/SSISet.java | 2 +-
.../catalina/ssi/SSIStopProcessingException.java | 2 +-
java/org/apache/catalina/startup/Bootstrap.java | 2 +-
java/org/apache/catalina/startup/Catalina.java | 2 +-
.../catalina/startup/CatalinaProperties.java | 2 +-
.../catalina/startup/ClassLoaderFactory.java | 2 +-
.../catalina/startup/ClusterRuleSetFactory.java | 2 +-
.../catalina/startup/ConnectorCreateRule.java | 4 +-
java/org/apache/catalina/startup/Constants.java | 2 +-
.../org/apache/catalina/startup/ContextConfig.java | 2 +-
.../apache/catalina/startup/ContextRuleSet.java | 2 +-
.../startup/CopyParentClassLoaderRule.java | 2 +-
java/org/apache/catalina/startup/Embedded.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 +-
.../apache/catalina/startup/HomesUserDatabase.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 2 +-
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 | 2 +-
.../apache/catalina/startup/SetNextNamingRule.java | 4 +-
java/org/apache/catalina/startup/TldConfig.java | 35 +-
java/org/apache/catalina/startup/TldRuleSet.java | 2 +-
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 +-
java/org/apache/catalina/startup/WebRuleSet.java | 2 +-
java/org/apache/catalina/tribes/ByteMessage.java | 2 +-
java/org/apache/catalina/tribes/Channel.java | 2 +-
.../apache/catalina/tribes/ChannelException.java | 2 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 2 +-
.../apache/catalina/tribes/ChannelReceiver.java | 2 +-
java/org/apache/catalina/tribes/ChannelSender.java | 2 +-
java/org/apache/catalina/tribes/Constants.java | 2 +-
.../org/apache/catalina/tribes/ManagedChannel.java | 2 +-
java/org/apache/catalina/tribes/Member.java | 2 +-
.../apache/catalina/tribes/MembershipListener.java | 2 +-
.../apache/catalina/tribes/MembershipService.java | 2 +-
.../catalina/tribes/group/ChannelCoordinator.java | 2 +-
.../tribes/group/ChannelInterceptorBase.java | 2 +-
.../apache/catalina/tribes/group/GroupChannel.java | 2 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 2 +-
.../apache/catalina/tribes/io/ListenCallback.java | 2 +-
.../apache/catalina/tribes/io/ObjectReader.java | 2 +-
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 5 +-
.../catalina/tribes/membership/Constants.java | 2 +-
.../catalina/tribes/membership/McastService.java | 2 +-
.../tribes/membership/McastServiceImpl.java | 2 +-
.../catalina/tribes/membership/MemberImpl.java | 2 +-
.../catalina/tribes/membership/Membership.java | 2 +-
.../tribes/tipis/AbstractReplicatedMap.java | 785 +++++++++++----------
.../catalina/tribes/tipis/LazyReplicatedMap.java | 135 ++--
.../catalina/tribes/tipis/ReplicatedMap.java | 52 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 38 +-
.../catalina/tribes/transport/AbstractRxTask.java | 2 +-
.../catalina/tribes/transport/Constants.java | 2 +-
.../tribes/transport/MultiPointSender.java | 2 +-
.../tribes/transport/ReplicationTransmitter.java | 2 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 2 +-
.../tribes/transport/bio/BioReplicationTask.java | 2 +-
.../catalina/tribes/transport/bio/BioSender.java | 2 +-
.../tribes/transport/bio/MultipointBioSender.java | 2 +-
.../tribes/transport/bio/util/FastQueue.java | 2 +-
.../tribes/transport/bio/util/LinkObject.java | 4 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 2 +-
.../tribes/transport/nio/NioReplicationTask.java | 2 +-
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 | 2 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 2 +-
java/org/apache/catalina/util/Base64.java | 2 +-
java/org/apache/catalina/util/CharsetMapper.java | 2 +-
.../catalina/util/CustomObjectInputStream.java | 2 +-
.../catalina/util/DefaultAnnotationProcessor.java | 2 +-
java/org/apache/catalina/util/Enumerator.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 | 2 +-
java/org/apache/catalina/util/MIME2Java.java | 2 +-
.../org/apache/catalina/util/ManifestResource.java | 2 +-
java/org/apache/catalina/util/ParameterMap.java | 2 +-
java/org/apache/catalina/util/RequestUtil.java | 2 +-
java/org/apache/catalina/util/ResourceSet.java | 2 +-
java/org/apache/catalina/util/ServerInfo.java | 2 +-
java/org/apache/catalina/util/Strftime.java | 2 +-
java/org/apache/catalina/util/StringParser.java | 2 +-
java/org/apache/catalina/util/URL.java | 2 +-
.../org/apache/catalina/valves/AccessLogValve.java | 2 +-
.../valves/CometConnectionManagerValve.java | 2 +-
.../apache/catalina/valves/ErrorReportValve.java | 2 +-
.../catalina/valves/ExtendedAccessLogValve.java | 2 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/PersistentValve.java | 2 +-
.../apache/catalina/valves/RemoteAddrValve.java | 2 +-
.../apache/catalina/valves/RemoteHostValve.java | 2 +-
.../apache/catalina/valves/RequestDumperValve.java | 2 +-
.../apache/catalina/valves/RequestFilterValve.java | 2 +-
java/org/apache/catalina/valves/SSLValve.java | 36 +-
.../org/apache/catalina/valves/SemaphoreValve.java | 2 +-
java/org/apache/catalina/valves/ValveBase.java | 2 +-
.../org/apache/catalina/valves/WebdavFixValve.java | 2 +-
java/org/apache/coyote/ajp/LocalStrings.properties | 2 -
.../apache/coyote/http11/LocalStrings.properties | 2 -
.../coyote/http11/LocalStrings_es.properties | 2 +-
.../coyote/http11/LocalStrings_fr.properties | 2 -
.../coyote/http11/LocalStrings_ja.properties | 2 -
.../coyote/http11/filters/ChunkedInputFilter.java | 11 +-
java/org/apache/el/ExpressionFactoryImpl.java | 2 +-
java/org/apache/el/MethodExpressionImpl.java | 68 +-
java/org/apache/el/ValueExpressionImpl.java | 58 +-
java/org/apache/el/lang/ELArithmetic.java | 2 +-
java/org/apache/el/lang/ELSupport.java | 2 +-
java/org/apache/el/lang/ExpressionBuilder.java | 2 +-
java/org/apache/el/lang/FunctionMapperFactory.java | 2 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 2 +-
java/org/apache/el/parser/ArithmeticNode.java | 2 +-
java/org/apache/el/parser/AstAnd.java | 2 +-
java/org/apache/el/parser/AstBracketSuffix.java | 2 +-
java/org/apache/el/parser/AstChoice.java | 2 +-
.../apache/el/parser/AstCompositeExpression.java | 2 +-
.../apache/el/parser/AstDeferredExpression.java | 2 +-
java/org/apache/el/parser/AstDiv.java | 2 +-
java/org/apache/el/parser/AstDotSuffix.java | 2 +-
.../org/apache/el/parser/AstDynamicExpression.java | 2 +-
java/org/apache/el/parser/AstEmpty.java | 2 +-
java/org/apache/el/parser/AstEqual.java | 2 +-
java/org/apache/el/parser/AstFalse.java | 2 +-
java/org/apache/el/parser/AstFloatingPoint.java | 2 +-
java/org/apache/el/parser/AstFunction.java | 2 +-
java/org/apache/el/parser/AstGreaterThan.java | 2 +-
java/org/apache/el/parser/AstGreaterThanEqual.java | 2 +-
java/org/apache/el/parser/AstIdentifier.java | 2 +-
java/org/apache/el/parser/AstInteger.java | 2 +-
java/org/apache/el/parser/AstLessThan.java | 2 +-
java/org/apache/el/parser/AstLessThanEqual.java | 2 +-
.../org/apache/el/parser/AstLiteralExpression.java | 7 +-
java/org/apache/el/parser/AstMinus.java | 2 +-
java/org/apache/el/parser/AstMod.java | 2 +-
java/org/apache/el/parser/AstMult.java | 2 +-
java/org/apache/el/parser/AstNegative.java | 2 +-
java/org/apache/el/parser/AstNot.java | 2 +-
java/org/apache/el/parser/AstNotEqual.java | 2 +-
java/org/apache/el/parser/AstNull.java | 2 +-
java/org/apache/el/parser/AstOr.java | 2 +-
java/org/apache/el/parser/AstPlus.java | 2 +-
java/org/apache/el/parser/AstString.java | 2 +-
java/org/apache/el/parser/AstTrue.java | 2 +-
java/org/apache/el/parser/AstValue.java | 2 +-
java/org/apache/el/parser/BooleanNode.java | 2 +-
java/org/apache/el/parser/Node.java | 2 +-
java/org/apache/el/parser/NodeVisitor.java | 2 +-
java/org/apache/el/parser/SimpleNode.java | 2 +-
java/org/apache/el/util/MessageFactory.java | 2 +-
java/org/apache/el/util/ReflectionUtil.java | 2 +-
java/org/apache/jasper/Constants.java | 9 +
java/org/apache/jasper/JspC.java | 23 +-
.../apache/jasper/compiler/ELFunctionMapper.java | 9 +-
java/org/apache/jasper/compiler/ELParser.java | 133 +++-
java/org/apache/jasper/compiler/Generator.java | 4 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 2 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 8 +
java/org/apache/jasper/compiler/JspConfig.java | 4 +-
.../apache/jasper/compiler/JspDocumentParser.java | 77 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 2 +-
java/org/apache/jasper/compiler/SmapUtil.java | 17 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 2 +-
.../apache/jasper/compiler/TagPluginManager.java | 2 +-
.../apache/jasper/compiler/TldLocationsCache.java | 8 +-
java/org/apache/jasper/compiler/Validator.java | 207 +++---
.../jasper/resources/LocalStrings.properties | 5 +-
.../jasper/resources/LocalStrings_es.properties | 1 -
.../jasper/resources/LocalStrings_fr.properties | 2 -
.../jasper/resources/LocalStrings_ja.properties | 2 -
.../apache/jasper/runtime/AnnotationHelper.java | 2 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 3 +
java/org/apache/jasper/util/Enumerator.java | 2 +-
java/org/apache/jasper/xmlparser/ASCIIReader.java | 2 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 2 +-
java/org/apache/jasper/xmlparser/ParserUtils.java | 60 +-
java/org/apache/jasper/xmlparser/SymbolTable.java | 2 +-
java/org/apache/jasper/xmlparser/TreeNode.java | 2 +-
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/jk/config/BaseJkConfig.java | 2 +-
java/org/apache/juli/ClassLoaderLogManager.java | 3 +-
java/org/apache/juli/DateFormatCache.java | 2 +-
java/org/apache/juli/FileHandler.java | 2 +-
java/org/apache/juli/logging/Log.java | 2 +-
.../juli/logging/LogConfigurationException.java | 2 +-
java/org/apache/juli/logging/LogFactory.java | 2 +-
.../org/apache/naming/ContextAccessController.java | 8 +-
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 | 2 +-
.../naming/NamingContextBindingsEnumeration.java | 2 +-
.../apache/naming/NamingContextEnumeration.java | 2 +-
java/org/apache/naming/NamingEntry.java | 2 +-
java/org/apache/naming/NamingService.java | 2 +-
java/org/apache/naming/NamingServiceMBean.java | 2 +-
java/org/apache/naming/ResourceEnvRef.java | 2 +-
java/org/apache/naming/ResourceLinkRef.java | 2 +-
java/org/apache/naming/ResourceRef.java | 2 +-
java/org/apache/naming/SelectorContext.java | 2 +-
java/org/apache/naming/TransactionRef.java | 2 +-
java/org/apache/naming/factory/EjbFactory.java | 2 +-
.../apache/naming/factory/MailSessionFactory.java | 2 +-
java/org/apache/naming/factory/OpenEjbFactory.java | 2 +-
.../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 +-
.../apache/naming/resources/BaseDirContext.java | 2 +-
java/org/apache/naming/resources/CacheEntry.java | 2 +-
.../naming/resources/DirContextURLConnection.java | 2 +-
.../resources/DirContextURLStreamHandler.java | 2 +-
.../DirContextURLStreamHandlerFactory.java | 2 +-
.../apache/naming/resources/FileDirContext.java | 2 +-
.../resources/ImmutableNameNotFoundException.java | 2 +-
.../apache/naming/resources/ProxyDirContext.java | 2 +-
.../resources/RecyclableNamingEnumeration.java | 2 +-
java/org/apache/naming/resources/Resource.java | 2 +-
.../naming/resources/ResourceAttributes.java | 2 +-
.../org/apache/naming/resources/ResourceCache.java | 2 +-
.../apache/naming/resources/VirtualDirContext.java | 2 +-
.../org/apache/naming/resources/WARDirContext.java | 2 +-
java/org/apache/naming/resources/jndi/Handler.java | 2 +-
java/org/apache/tomcat/jni/Address.java | 2 +-
java/org/apache/tomcat/jni/BIOCallback.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 | 2 +-
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 | 2 +-
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 | 17 +-
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/Time.java | 2 +-
java/org/apache/tomcat/jni/User.java | 2 +-
java/org/apache/tomcat/util/buf/Ascii.java | 18 +-
java/org/apache/tomcat/util/buf/Base64.java | 2 +-
.../tomcat/util/descriptor/DigesterFactory.java | 80 ++-
.../tomcat/util/descriptor/LocalResolver.java | 17 +
.../tomcat/util/descriptor/LocalStrings.properties | 2 +
.../tomcat/util/descriptor/XmlIdentifiers.java | 4 +
.../digester/AbstractObjectCreationFactory.java | 3 +-
.../tomcat/util/digester/AbstractRulesImpl.java | 3 +-
.../apache/tomcat/util/digester/ArrayStack.java | 3 +-
.../tomcat/util/digester/CallMethodRule.java | 3 +-
.../apache/tomcat/util/digester/CallParamRule.java | 3 +-
.../tomcat/util/digester/FactoryCreateRule.java | 3 +-
.../apache/tomcat/util/digester/GenericParser.java | 3 +-
.../tomcat/util/digester/NodeCreateRule.java | 3 +-
.../tomcat/util/digester/ObjectCreateRule.java | 3 +-
.../util/digester/ObjectCreationFactory.java | 3 +-
.../tomcat/util/digester/ObjectParamRule.java | 3 +-
.../util/digester/ParserFeatureSetterFactory.java | 3 +-
.../tomcat/util/digester/PathCallParamRule.java | 3 +-
java/org/apache/tomcat/util/digester/Rule.java | 3 +-
java/org/apache/tomcat/util/digester/RuleSet.java | 3 +-
.../apache/tomcat/util/digester/RuleSetBase.java | 3 +-
java/org/apache/tomcat/util/digester/Rules.java | 3 +-
.../org/apache/tomcat/util/digester/RulesBase.java | 3 +-
.../apache/tomcat/util/digester/SetNextRule.java | 3 +-
.../tomcat/util/digester/SetPropertiesRule.java | 3 +-
.../tomcat/util/digester/SetPropertyRule.java | 3 +-
.../apache/tomcat/util/digester/SetRootRule.java | 3 +-
.../apache/tomcat/util/digester/SetTopRule.java | 3 +-
.../util/digester/WithDefaultsRulesWrapper.java | 3 +-
.../apache/tomcat/util/digester/XercesParser.java | 3 +-
java/org/apache/tomcat/util/http/BaseRequest.java | 2 +-
java/org/apache/tomcat/util/http/Cookies.java | 127 ++--
.../util/http/fileupload/DefaultFileItem.java | 2 +-
.../http/fileupload/DefaultFileItemFactory.java | 2 +-
.../http/fileupload/DeferredFileOutputStream.java | 2 +-
.../util/http/fileupload/DiskFileUpload.java | 2 +-
.../tomcat/util/http/fileupload/FileItem.java | 2 +-
.../util/http/fileupload/FileItemFactory.java | 2 +-
.../tomcat/util/http/fileupload/FileUpload.java | 2 +-
.../util/http/fileupload/FileUploadBase.java | 2 +-
.../util/http/fileupload/FileUploadException.java | 2 +-
.../util/http/fileupload/MultipartStream.java | 2 +-
.../http/fileupload/ThresholdingOutputStream.java | 2 +-
.../tomcat/util/http/fileupload/package.html | 1 -
.../tomcat/util/modeler/BaseAttributeFilter.java | 2 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 17 +-
.../apache/tomcat/util/modeler/FeatureInfo.java | 2 +-
.../apache/tomcat/util/modeler/ManagedBean.java | 2 +-
.../tomcat/util/modeler/NotificationInfo.java | 2 +-
.../apache/tomcat/util/modeler/ParameterInfo.java | 2 +-
.../tomcat/util/modeler/mbeans-descriptors.dtd | 2 -
java/org/apache/tomcat/util/net/URL.java | 2 +-
java/org/apache/tomcat/util/res/StringManager.java | 2 +-
.../tomcat/util/security/PrivilegedGetTccl.java | 11 +-
.../tomcat/util/security/PrivilegedSetTccl.java} | 31 +-
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 24 +-
test/org/apache/el/TestELEvaluation.java | 33 +-
test/org/apache/jasper/compiler/TestELParser.java | 220 +++++-
.../org/apache/juli/TestClassLoaderLogManager.java | 108 ++-
webapps/docs/appdev/deployment.xml | 2 +-
webapps/docs/appdev/index.xml | 2 +-
webapps/docs/apr.xml | 2 +
webapps/docs/changelog.xml | 222 +++++-
webapps/docs/config/context.xml | 5 +-
webapps/docs/config/listeners.xml | 17 +-
webapps/docs/config/project.xml | 5 +-
webapps/docs/config/valve.xml | 43 +-
webapps/docs/default-servlet.xml | 31 +-
webapps/docs/tomcat-docs.xsl | 37 +-
webapps/docs/windows-service-howto.xml | 129 ++--
627 files changed, 3028 insertions(+), 2038 deletions(-)
copy test/org/apache/el/TesterFunctions.java => java/org/apache/tomcat/util/security/PrivilegedGetTccl.java (76%)
copy java/{javax/el/ELContextEvent.java => org/apache/tomcat/util/security/PrivilegedSetTccl.java} (69%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git
More information about the pkg-java-commits
mailing list