[tomcat6] 02/02: Merge branch 'master' into squeeze-security
Markus Koschany
apo-guest at moszumanska.debian.org
Sat Feb 27 15:44:11 GMT 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch squeeze-security
in repository tomcat6.
commit c65b5ed39b273cb64b6ff8cd6e8c884420e9b689
Merge: f4cb9e7 acc7749
Author: Markus Koschany <apo at debian.org>
Date: Sat Feb 27 16:43:39 2016 +0100
Merge branch 'master' into squeeze-security
.../RestrictedServlets.properties => .gitignore | 28 +-
BUILDING.txt | 168 +-
KEYS | 173 +-
LICENSE | 339 +-
NOTICE | 20 +-
RELEASE-NOTES | 16 +-
RELEASE-PLAN-6.0.txt | 2 -
RUNNING.txt | 450 ++-
STATUS.txt | 150 +-
bin/catalina-tasks.xml | 7 +-
bin/catalina.bat | 8 +-
bin/catalina.sh | 24 +-
bin/cpappend.bat | 2 -
bin/daemon.sh | 244 ++
bin/digest.bat | 2 -
bin/digest.sh | 2 -
bin/service.bat | 133 +-
bin/setclasspath.bat | 15 +-
bin/setclasspath.sh | 21 +-
bin/shutdown.bat | 2 -
bin/shutdown.sh | 2 -
bin/startup.bat | 2 -
bin/startup.sh | 2 -
bin/tool-wrapper.bat | 2 -
bin/tool-wrapper.sh | 2 -
bin/version.bat | 2 -
bin/version.sh | 2 -
build.properties.default | 67 +-
build.xml | 263 +-
conf/catalina.policy | 2 -
conf/catalina.properties | 6 +-
conf/web.xml | 4109 ++++++++++++++++++--
debian/README.Debian | 15 +
debian/changelog | 210 +-
debian/compat | 2 +-
debian/control | 27 +-
debian/copyright | 2 +-
debian/defaults.template | 2 +
debian/logrotate.md5sum | 1 +
debian/{logrotate => logrotate.template} | 2 +-
debian/maven.rules | 12 +-
debian/orig-tar.sh | 4 +-
...-deploy-webapps-target-from-deploy-target.patch | 9 +-
.../0005-change-default-DBCP-factory-class.patch | 9 +-
.../0006-add-JARs-below-var-to-class-loader.patch | 9 +-
...-java.security.policy-file-in-catalina.sh.patch | 13 +-
debian/po/sk.po | 60 +
debian/po/tr.po | 59 +
debian/rules | 1 -
debian/tomcat6-instance-create | 32 +-
debian/tomcat6.cron.daily | 11 +-
debian/tomcat6.init | 2 +-
debian/tomcat6.install | 2 +
debian/tomcat6.postinst | 13 +-
debian/tomcat6.postrm | 6 +-
dist.xml | 189 +-
eclipse.classpath | 6 +-
extras.xml | 43 +-
java/javax/annotation/Generated.java | 12 +-
java/javax/annotation/PostConstruct.java | 6 +-
java/javax/annotation/PreDestroy.java | 6 +-
java/javax/annotation/Resource.java | 6 +-
java/javax/annotation/Resources.java | 6 +-
java/javax/annotation/security/DeclareRoles.java | 6 +-
java/javax/annotation/security/DenyAll.java | 8 +-
java/javax/annotation/security/PermitAll.java | 6 +-
java/javax/annotation/security/RolesAllowed.java | 6 +-
java/javax/annotation/security/RunAs.java | 6 +-
java/javax/el/ArrayELResolver.java | 25 +-
java/javax/el/BeanELResolver.java | 60 +-
java/javax/el/ResourceBundleELResolver.java | 194 +-
java/javax/el/Util.java | 57 +
java/javax/servlet/GenericServlet.java | 2 +-
java/javax/servlet/RequestDispatcher.java | 2 +-
java/javax/servlet/Servlet.java | 2 +-
java/javax/servlet/ServletContext.java | 297 +-
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 | 40 +-
java/javax/servlet/http/HttpServletRequest.java | 151 +-
java/javax/servlet/http/HttpServletResponse.java | 62 +-
.../servlet/http/HttpServletResponseWrapper.java | 2 +-
java/javax/servlet/http/HttpSession.java | 162 +-
.../servlet/http/HttpSessionBindingEvent.java | 2 +-
.../servlet/http/HttpSessionBindingListener.java | 2 +-
java/javax/servlet/http/HttpSessionContext.java | 2 +-
java/javax/servlet/http/LocalStrings.properties | 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 -
java/javax/servlet/jsp/resources/jspxml.dtd | 5 +-
java/javax/servlet/jsp/resources/jspxml.xsd | 2 +-
.../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 | 2103 ++++++++++
.../servlet/resources/javaee_web_services_1_2.xsd | 755 ++++
.../resources/javaee_web_services_client_1_2.xsd | 586 +++
java/javax/servlet/resources/web-app_2_4.xsd | 6 -
java/javax/servlet/resources/web-app_2_5.xsd | 7 +-
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 | 173 +-
java/org/apache/catalina/Engine.java | 2 +-
java/org/apache/catalina/Globals.java | 74 +-
java/org/apache/catalina/Group.java | 2 +-
java/org/apache/catalina/Host.java | 42 +-
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 | 40 +-
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 | 42 +-
java/org/apache/catalina/Service.java | 2 +-
java/org/apache/catalina/Session.java | 21 +-
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 | 18 +-
java/org/apache/catalina/ant/jmx/Arg.java | 2 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 2 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 4 +-
.../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 | 173 +-
.../catalina/authenticator/FormAuthenticator.java | 39 +-
.../authenticator/NonLoginAuthenticator.java | 2 +-
.../catalina/authenticator/SSLAuthenticator.java | 2 +-
.../catalina/authenticator/SavedRequest.java | 17 +-
.../catalina/authenticator/SingleSignOn.java | 2 +-
.../catalina/authenticator/SingleSignOnEntry.java | 2 +-
.../catalina/connector/ClientAbortException.java | 2 +-
java/org/apache/catalina/connector/Connector.java | 118 +-
.../apache/catalina/connector/CoyoteAdapter.java | 132 +-
.../apache/catalina/connector/CoyotePrincipal.java | 2 +-
.../org/apache/catalina/connector/InputBuffer.java | 5 +-
.../catalina/connector/LocalStrings.properties | 2 +
.../apache/catalina/connector/MapperListener.java | 15 +-
.../apache/catalina/connector/OutputBuffer.java | 7 +-
java/org/apache/catalina/connector/Request.java | 175 +-
.../apache/catalina/connector/RequestFacade.java | 2 +-
java/org/apache/catalina/connector/Response.java | 2 +-
.../apache/catalina/connector/ResponseFacade.java | 2 +-
.../catalina/connector/mbeans-descriptors.xml | 11 +-
.../apache/catalina/core/ApplicationContext.java | 69 +-
.../catalina/core/ApplicationContextFacade.java | 2 +-
.../catalina/core/ApplicationDispatcher.java | 2 +-
.../catalina/core/ApplicationFilterChain.java | 2 +-
.../catalina/core/ApplicationFilterConfig.java | 87 +-
.../catalina/core/ApplicationFilterFactory.java | 2 +-
.../catalina/core/ApplicationHttpRequest.java | 154 +-
.../catalina/core/ApplicationHttpResponse.java | 2 +-
.../apache/catalina/core/ApplicationRequest.java | 2 +-
.../apache/catalina/core/ApplicationResponse.java | 2 +-
.../apache/catalina/core/AprLifecycleListener.java | 280 +-
java/org/apache/catalina/core/ContainerBase.java | 152 +-
java/org/apache/catalina/core/DummyRequest.java | 2 +-
java/org/apache/catalina/core/DummyResponse.java | 2 +-
java/org/apache/catalina/core/JasperListener.java | 2 +-
.../core/JreMemoryLeakPreventionListener.java | 13 +-
.../apache/catalina/core/LocalStrings.properties | 18 +-
.../catalina/core/LocalStrings_es.properties | 5 +-
.../catalina/core/NamingContextListener.java | 6 +-
.../catalina/core/RestrictedServlets.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 637 +--
.../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 | 28 +-
.../apache/catalina/core/StandardHostValve.java | 2 +-
java/org/apache/catalina/core/StandardServer.java | 51 +-
.../catalina/core/StandardThreadExecutor.java | 72 +-
java/org/apache/catalina/core/StandardWrapper.java | 41 +-
.../catalina/core/StandardWrapperFacade.java | 2 +-
.../apache/catalina/core/StandardWrapperValve.java | 2 +-
.../apache/catalina/core/mbeans-descriptors.xml | 26 +-
.../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 +-
.../catalina/filters/CsrfPreventionFilter.java | 24 +-
.../catalina/filters/FailedRequestFilter.java | 38 +-
.../filters/SetCharacterEncodingFilter.java | 91 +-
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/ClusterManager.java | 2 +-
.../org/apache/catalina/ha/ClusterMessageBase.java | 14 -
java/org/apache/catalina/ha/ClusterRuleSet.java | 2 +-
java/org/apache/catalina/ha/ClusterValve.java | 2 +-
java/org/apache/catalina/ha/Constants.java | 2 +-
.../ha/authenticator/ClusterSingleSignOn.java | 16 +-
.../authenticator/ClusterSingleSignOnListener.java | 16 +-
.../ha/authenticator/SingleSignOnMessage.java | 9 +
.../catalina/ha/context/ReplicatedContext.java | 70 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 2 +-
.../apache/catalina/ha/session/BackupManager.java | 8 -
.../catalina/ha/session/ClusterManagerBase.java | 52 +-
.../ha/session/ClusterSessionListener.java | 2 +-
.../apache/catalina/ha/session/DeltaManager.java | 49 +-
.../apache/catalina/ha/session/DeltaRequest.java | 1 -
.../apache/catalina/ha/session/DeltaSession.java | 49 +-
.../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 +-
.../ha/session/SimpleTcpReplicationManager.java | 9 +-
.../catalina/ha/session/mbeans-descriptors.xml | 30 +-
java/org/apache/catalina/ha/tcp/Constants.java | 2 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 4 +-
.../apache/catalina/ha/tcp/SendMessageData.java | 2 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 62 +-
.../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 | 7 +-
.../apache/catalina/loader/WebappClassLoader.java | 171 +-
java/org/apache/catalina/loader/WebappLoader.java | 2 +-
java/org/apache/catalina/manager/Constants.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 11 +-
.../apache/catalina/manager/ManagerServlet.java | 4 +-
.../catalina/manager/StatusManagerServlet.java | 2 +-
.../apache/catalina/manager/StatusTransformer.java | 61 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
.../manager/host/HTMLHostManagerServlet.java | 5 +-
.../catalina/manager/host/HostManagerServlet.java | 3 +-
.../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 +-
.../mbeans/JmxRemoteLifecycleListener.java | 6 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 +-
java/org/apache/catalina/mbeans/MBeanUtils.java | 32 +-
.../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/CombinedRealm.java | 24 +-
java/org/apache/catalina/realm/Constants.java | 2 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 17 +-
.../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 | 17 +-
java/org/apache/catalina/realm/JNDIRealm.java | 6 +-
.../apache/catalina/realm/LocalStrings.properties | 7 +-
.../catalina/realm/LocalStrings_es.properties | 2 +-
.../catalina/realm/LocalStrings_fr.properties | 2 -
.../catalina/realm/LocalStrings_ja.properties | 2 -
java/org/apache/catalina/realm/LockOutRealm.java | 4 +-
java/org/apache/catalina/realm/MemoryRealm.java | 2 +-
java/org/apache/catalina/realm/MemoryRuleSet.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 99 +-
.../apache/catalina/realm/UserDatabaseRealm.java | 2 +-
.../X509SubjectDnRetriever.java} | 25 +-
.../X509UsernameRetriever.java} | 31 +-
java/org/apache/catalina/realm/package.html | 52 +-
.../catalina/security/SecurityClassLoad.java | 35 +-
.../org/apache/catalina/security/SecurityUtil.java | 71 +-
java/org/apache/catalina/servlets/CGIServlet.java | 132 +-
.../apache/catalina/servlets/DefaultServlet.java | 387 +-
.../catalina/servlets/InvokerHttpRequest.java | 2 +-
.../apache/catalina/servlets/InvokerServlet.java | 2 +-
.../catalina/servlets/LocalStrings.properties | 3 +
.../apache/catalina/servlets/WebdavServlet.java | 33 +-
java/org/apache/catalina/session/Constants.java | 18 +-
java/org/apache/catalina/session/FileStore.java | 207 +-
java/org/apache/catalina/session/JDBCStore.java | 113 +-
.../catalina/session/LocalStrings.properties | 4 +
java/org/apache/catalina/session/ManagerBase.java | 511 ++-
.../apache/catalina/session/PersistentManager.java | 2 +-
.../catalina/session/PersistentManagerBase.java | 2 +-
.../apache/catalina/session/StandardManager.java | 241 +-
.../apache/catalina/session/StandardSession.java | 125 +-
.../catalina/session/StandardSessionFacade.java | 13 +-
java/org/apache/catalina/session/StoreBase.java | 39 +-
.../session/TooManyActiveSessionsException.java | 57 +
.../apache/catalina/session/mbeans-descriptors.xml | 24 +
.../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 | 10 +-
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 | 328 +-
.../apache/catalina/startup/ContextRuleSet.java | 2 +-
.../startup/CopyParentClassLoaderRule.java | 2 +-
.../apache/catalina/startup/DigesterFactory.java | 3 +
java/org/apache/catalina/startup/Embedded.java | 4 +-
java/org/apache/catalina/startup/EngineConfig.java | 2 +-
.../org/apache/catalina/startup/EngineRuleSet.java | 2 +-
java/org/apache/catalina/startup/ExpandWar.java | 9 +-
.../apache/catalina/startup/HomesUserDatabase.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 273 +-
java/org/apache/catalina/startup/HostRuleSet.java | 2 +-
.../catalina/startup/LocalStrings.properties | 7 +-
.../catalina/startup/LocalStrings_es.properties | 6 +-
.../catalina/startup/LocalStrings_fr.properties | 6 +-
.../catalina/startup/LocalStrings_ja.properties | 6 +-
.../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 | 162 +-
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 +-
.../apache/catalina/startup/catalina.properties | 81 -
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/ChannelListener.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 | 4 +-
.../tribes/group/ChannelInterceptorBase.java | 2 +-
.../apache/catalina/tribes/group/GroupChannel.java | 2 +-
.../apache/catalina/tribes/group/RpcChannel.java | 2 +-
.../group/interceptors/TcpFailureDetector.java | 14 +-
.../group/interceptors/TcpPingInterceptor.java | 28 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 6 +-
.../tribes/io/DirectByteArrayOutputStream.java | 1 -
.../apache/catalina/tribes/io/ListenCallback.java | 2 +-
.../apache/catalina/tribes/io/ObjectReader.java | 19 +-
.../catalina/tribes/io/ReplicationStream.java | 7 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 26 +-
.../catalina/tribes/membership/Constants.java | 2 +-
.../catalina/tribes/membership/McastService.java | 2 +-
.../tribes/membership/McastServiceImpl.java | 4 +-
.../catalina/tribes/membership/MemberImpl.java | 4 +-
.../catalina/tribes/membership/Membership.java | 3 +-
.../tribes/tipis/AbstractReplicatedMap.java | 786 ++--
.../catalina/tribes/tipis/LazyReplicatedMap.java | 135 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 50 +-
.../catalina/tribes/tipis/ReplicatedMapEntry.java | 38 +-
.../catalina/tribes/transport/AbstractRxTask.java | 2 +-
.../catalina/tribes/transport/AbstractSender.java | 20 +-
.../catalina/tribes/transport/Constants.java | 2 +-
.../tribes/transport/MultiPointSender.java | 2 +-
.../catalina/tribes/transport/ReceiverBase.java | 20 +-
.../tribes/transport/ReplicationTransmitter.java | 13 +-
.../catalina/tribes/transport/bio/BioReceiver.java | 16 +-
.../tribes/transport/bio/BioReplicationTask.java | 4 +-
.../catalina/tribes/transport/bio/BioSender.java | 18 +-
.../tribes/transport/bio/MultipointBioSender.java | 2 +-
.../tribes/transport/bio/PooledMultiSender.java | 19 +-
.../tribes/transport/bio/util/FastQueue.java | 10 +-
.../tribes/transport/bio/util/LinkObject.java | 5 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 7 +-
.../tribes/transport/nio/NioReplicationTask.java | 2 +-
.../catalina/tribes/transport/nio/NioSender.java | 22 +-
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 | 4 +-
.../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 | 108 +-
.../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 | 4 +-
java/org/apache/catalina/util/HexUtils.java | 56 -
java/org/apache/catalina/util/InstanceSupport.java | 2 +-
.../org/apache/catalina/util/LifecycleSupport.java | 2 +-
.../apache/catalina/util/LocalStrings.properties | 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 | 26 +-
java/org/apache/catalina/util/RequestUtil.java | 65 +-
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 | 25 +-
.../catalina/valves/ExtendedAccessLogValve.java | 24 +-
.../apache/catalina/valves/LocalStrings.properties | 105 +-
.../catalina/valves/LocalStrings_es.properties | 82 +-
.../catalina/valves/LocalStrings_fr.properties | 82 +-
.../apache/catalina/valves/PersistentValve.java | 163 +-
.../apache/catalina/valves/RemoteAddrValve.java | 43 +-
.../apache/catalina/valves/RemoteHostValve.java | 43 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 10 +-
.../apache/catalina/valves/RequestDumperValve.java | 2 +-
.../apache/catalina/valves/RequestFilterValve.java | 40 +-
java/org/apache/catalina/valves/SSLValve.java | 36 +-
.../org/apache/catalina/valves/SemaphoreValve.java | 2 +-
.../catalina/valves/StuckThreadDetectionValve.java | 297 ++
java/org/apache/catalina/valves/ValveBase.java | 2 +-
.../org/apache/catalina/valves/WebdavFixValve.java | 2 +-
.../apache/catalina/valves/mbeans-descriptors.xml | 57 +-
java/org/apache/coyote/AbstractProtocol.java | 92 +
java/org/apache/coyote/Constants.java | 40 +
java/org/apache/coyote/OutputBuffer.java | 7 +-
java/org/apache/coyote/Request.java | 6 +-
java/org/apache/coyote/Response.java | 123 +-
java/org/apache/coyote/ajp/AjpAprProcessor.java | 47 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 19 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 44 +-
java/org/apache/coyote/ajp/AjpProtocol.java | 19 +-
java/org/apache/coyote/ajp/Constants.java | 1 +
java/org/apache/coyote/ajp/LocalStrings.properties | 2 -
.../apache/coyote/http11/AbstractInputBuffer.java | 72 +
.../apache/coyote/http11/Http11AprProcessor.java | 34 +-
.../apache/coyote/http11/Http11AprProtocol.java | 36 +-
.../apache/coyote/http11/Http11NioProcessor.java | 34 +-
.../apache/coyote/http11/Http11NioProtocol.java | 99 +-
java/org/apache/coyote/http11/Http11Processor.java | 36 +-
java/org/apache/coyote/http11/Http11Protocol.java | 86 +-
.../coyote/http11/InternalAprInputBuffer.java | 76 +-
.../coyote/http11/InternalAprOutputBuffer.java | 5 +
.../apache/coyote/http11/InternalInputBuffer.java | 74 +-
.../coyote/http11/InternalNioInputBuffer.java | 242 +-
.../apache/coyote/http11/InternalOutputBuffer.java | 5 +
.../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 | 279 +-
.../http11/filters/FlushableGZIPOutputStream.java | 18 +-
.../coyote/http11/filters/IdentityInputFilter.java | 28 +-
.../coyote/http11/filters}/LocalStrings.properties | 23 +-
.../coyote/memory/MemoryProtocolHandler.java | 17 +-
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 | 67 +-
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 | 15 +-
java/org/apache/jasper/Constants.java | 26 +
java/org/apache/jasper/EmbeddedServletOptions.java | 223 +-
java/org/apache/jasper/JspC.java | 90 +-
java/org/apache/jasper/compiler/Compiler.java | 4 +-
.../apache/jasper/compiler/ELFunctionMapper.java | 9 +-
java/org/apache/jasper/compiler/ELNode.java | 8 +-
java/org/apache/jasper/compiler/ELParser.java | 303 +-
java/org/apache/jasper/compiler/Generator.java | 65 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 34 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 27 +-
java/org/apache/jasper/compiler/JspConfig.java | 32 +-
.../apache/jasper/compiler/JspDocumentParser.java | 146 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 2 +-
java/org/apache/jasper/compiler/JspUtil.java | 5 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 2 +-
java/org/apache/jasper/compiler/Parser.java | 15 +-
.../apache/jasper/compiler/ParserController.java | 2 +-
java/org/apache/jasper/compiler/SmapUtil.java | 17 +-
.../apache/jasper/compiler/TagFileProcessor.java | 2 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 44 +-
.../apache/jasper/compiler/TagPluginManager.java | 25 +-
.../apache/jasper/compiler/TldLocationsCache.java | 73 +-
java/org/apache/jasper/compiler/Validator.java | 279 +-
.../jasper/resources/LocalStrings.properties | 7 +-
.../jasper/resources/LocalStrings_es.properties | 3 +-
.../jasper/resources/LocalStrings_fr.properties | 2 -
.../jasper/resources/LocalStrings_ja.properties | 4 +-
.../apache/jasper/runtime/AnnotationHelper.java | 2 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 83 +-
.../jasper/runtime/ProtectedFunctionMapper.java | 105 +-
.../apache/jasper/security/SecurityClassLoad.java | 10 -
.../apache/jasper/servlet/JspCServletContext.java | 28 +-
.../apache/jasper/servlet/JspServletWrapper.java | 2 +-
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 | 194 +-
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/common/AjpConstants.java | 1 +
java/org/apache/jk/common/ChannelNioSocket.java | 51 +-
java/org/apache/jk/common/ChannelSocket.java | 51 +-
java/org/apache/jk/common/HandlerRequest.java | 41 +-
java/org/apache/jk/config/BaseJkConfig.java | 2 +-
java/org/apache/jk/core/MsgContext.java | 7 +-
java/org/apache/jk/server/JkCoyoteHandler.java | 35 +-
java/org/apache/jk/server/JkMain.java | 13 +
java/org/apache/juli/ClassLoaderLogManager.java | 35 +-
java/org/apache/juli/DateFormatCache.java | 14 +-
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/HandlerRef.java | 18 -
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 | 276 +-
java/org/apache/naming/ServiceRef.java | 16 -
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 | 9 +-
.../apache/naming/factory/TransactionFactory.java | 2 +-
.../apache/naming/java/javaURLContextFactory.java | 10 +-
.../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/EmptyDirContext.java | 341 ++
.../apache/naming/resources/FileDirContext.java | 39 +-
.../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/buildutil/Txt2Html.java | 6 +-
java/org/apache/tomcat/jni/Address.java | 4 +-
java/org/apache/tomcat/jni/BIOCallback.java | 5 +-
java/org/apache/tomcat/jni/Buffer.java | 89 +
java/org/apache/tomcat/jni/Directory.java | 5 +-
java/org/apache/tomcat/jni/Error.java | 8 +-
java/org/apache/tomcat/jni/File.java | 35 +-
java/org/apache/tomcat/jni/FileInfo.java | 2 -
java/org/apache/tomcat/jni/Global.java | 3 +-
java/org/apache/tomcat/jni/Library.java | 61 +-
.../jni/LibraryNotFoundError.java} | 40 +-
java/org/apache/tomcat/jni/Local.java | 3 +-
java/org/apache/tomcat/jni/Lock.java | 5 +-
java/org/apache/tomcat/jni/Mmap.java | 2 -
java/org/apache/tomcat/jni/Multicast.java | 3 +-
java/org/apache/tomcat/jni/OS.java | 8 +-
java/org/apache/tomcat/jni/PasswordCallback.java | 2 -
java/org/apache/tomcat/jni/Poll.java | 63 +-
java/org/apache/tomcat/jni/Pool.java | 7 +-
java/org/apache/tomcat/jni/PoolCallback.java | 2 -
java/org/apache/tomcat/jni/Proc.java | 7 +-
java/org/apache/tomcat/jni/ProcErrorCallback.java | 2 -
java/org/apache/tomcat/jni/Procattr.java | 11 +-
java/org/apache/tomcat/jni/Registry.java | 2 -
java/org/apache/tomcat/jni/SSL.java | 93 +-
java/org/apache/tomcat/jni/SSLContext.java | 67 +-
java/org/apache/tomcat/jni/SSLSocket.java | 7 +-
java/org/apache/tomcat/jni/Shm.java | 17 +-
java/org/apache/tomcat/jni/Sockaddr.java | 2 -
java/org/apache/tomcat/jni/Socket.java | 76 +-
java/org/apache/tomcat/jni/Status.java | 3 +-
java/org/apache/tomcat/jni/Stdlib.java | 5 +-
.../tomcat/jni/{PoolCallback.java => Thread.java} | 12 +-
java/org/apache/tomcat/jni/Time.java | 5 +-
java/org/apache/tomcat/jni/User.java | 5 +-
java/org/apache/tomcat/util/buf/Ascii.java | 18 +-
java/org/apache/tomcat/util/buf/B2CConverter.java | 19 +-
java/org/apache/tomcat/util/buf/Base64.java | 2 +-
java/org/apache/tomcat/util/buf/HexUtils.java | 41 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 114 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 92 +-
.../tomcat/util/collections/ConcurrentCache.java | 59 +
.../util/descriptor}/Constants.java | 18 +-
.../tomcat/util/descriptor/DigesterFactory.java | 160 +
.../tomcat/util/descriptor/LocalResolver.java | 160 +
.../util/descriptor/LocalStrings.properties} | 10 +-
.../util/descriptor/LocalStrings_es.properties} | 6 +-
.../tomcat/util/descriptor/XmlErrorHandler.java | 72 +
.../tomcat/util/descriptor/XmlIdentifiers.java | 73 +
.../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 +-
java/org/apache/tomcat/util/digester/Digester.java | 361 +-
.../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 | 158 +-
.../tomcat/util/http/LocalStrings.properties | 5 +
java/org/apache/tomcat/util/http/MimeHeaders.java | 34 +-
java/org/apache/tomcat/util/http/Parameters.java | 194 +-
.../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 | 10 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 292 +-
.../apache/tomcat/util/http/parser/HttpParser.java | 501 +++
.../apache/tomcat/util/http/parser/MediaType.java | 125 +
.../tomcat/util/http/parser/MediaTypeCache.java | 65 +
.../tomcat/util/http/res/LocalStrings.properties | 18 +-
.../util/http/res/LocalStrings_ja.properties | 50 +-
.../org/apache/tomcat/util/log/UserDataHelper.java | 149 +
.../tomcat/util/modeler/BaseAttributeFilter.java | 2 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 55 +-
.../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 -
.../util/net/AbstractEndpoint.java} | 35 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 156 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 33 +-
.../tomcat/util/net/NioBlockingSelector.java | 1 -
java/org/apache/tomcat/util/net/NioChannel.java | 36 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 405 +-
.../apache/tomcat/util/net/SSLImplementation.java | 3 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 3 -
.../apache/tomcat/util/net/SocketProperties.java | 6 +-
java/org/apache/tomcat/util/net/URL.java | 2 +-
.../apache/tomcat/util/net/jsse/JSSEFactory.java | 19 +-
.../tomcat/util/net/jsse/JSSEImplementation.java | 14 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 379 +-
.../util/net/jsse/res/LocalStrings.properties | 7 +
.../tomcat/util/net/res/LocalStrings.properties | 9 +
java/org/apache/tomcat/util/res/StringManager.java | 182 +-
.../util/security/PrivilegedGetTccl.java} | 20 +-
.../util/security/PrivilegedSetTccl.java} | 30 +-
res/INSTALLLICENSE | 339 +-
res/License.rtf | 409 --
res/META-INF/default.notice | 2 +-
res/META-INF/servlet-api.jar.license | 546 +++
res/META-INF/servlet-api.jar.notice | 11 +
res/maven/README.txt | 39 +
res/maven/annotations-api.pom | 8 +
res/maven/{coyote.pom => catalina-ant.pom} | 22 +-
res/maven/catalina-ha.pom | 8 +
res/maven/catalina.pom | 10 +-
res/maven/coyote.pom | 14 +-
res/maven/dbcp.pom | 8 +
res/maven/el-api.pom | 8 +
res/maven/jasper-el.pom | 8 +
res/maven/jasper.pom | 10 +-
res/maven/jsp-api.pom | 8 +
res/maven/juli-adapters.pom | 8 +
res/maven/juli-extras.pom | 8 +
res/maven/juli.pom | 8 +
res/maven/mvn-pub.xml | 272 +-
res/maven/mvn.properties.default | 43 +-
res/maven/servlet-api.pom | 13 +
...catalina.pom => tomcat-catalina-jmx-remote.pom} | 26 +-
res/maven/{jsp-api.pom => tomcat-catalina-ws.pom} | 20 +-
res/maven/{dbcp.pom => tomcat-i18n-es.pom} | 12 +-
res/maven/{dbcp.pom => tomcat-i18n-fr.pom} | 12 +-
res/maven/{dbcp.pom => tomcat-i18n-ja.pom} | 12 +-
res/maven/tribes.pom | 8 +
res/tomcat.nsi | 40 +-
test/build.xml | 71 -
.../deployment/dirContext}/META-INF/context.xml | 3 +-
.../deployment/dirContext/index.html | 8 +-
.../deployment/dirNoContext/index.html | 8 +-
test/javax/el/TestArrayELResolver.java | 340 ++
test/org/apache/catalina/TestServerFactory.java | 53 +
.../apache/catalina/connector/TestConnector.java | 34 +-
.../catalina/core/TestApplicationHttpRequest.java | 358 ++
.../ha/session/TestSerializablePrincipal.java | 111 +-
.../{TestPrincipal.java => TesterPrincipal.java} | 12 +-
.../catalina/startup/CaseInsensitiveKeyMap.java | 197 +
.../catalina/startup/FastNonSecureRandom.java | 60 +
.../apache/catalina/startup/LoggingBaseTest.java | 125 +
test/org/apache/catalina/startup/TestTomcat.java | 594 +++
test/org/apache/catalina/startup/Tomcat.java | 1207 ++++++
.../apache/catalina/startup/TomcatBaseTest.java | 796 ++++
test/org/apache/catalina/tribes/TesterUtil.java | 52 +
.../group/TestGroupChannelMemberArrival.java | 181 +
.../TestGroupChannelOptionFlag.java} | 56 +-
.../TestGroupChannelSenderConnections.java} | 132 +-
.../TestGroupChannelStartStop.java} | 82 +-
.../interceptors/TestDomainFilterInterceptor.java} | 31 +-
.../interceptors/TestNonBlockingCoordinator.java | 106 +-
.../interceptors/TestOrderInterceptor.java | 90 +-
.../interceptors}/TestTcpFailureDetector.java | 88 +-
.../apache/catalina/tribes/io/TestXByteBuffer.java | 57 +
.../TestMemberImplSerialization.java} | 31 +-
.../{TestNioSender.java => NioSenderTest.java} | 10 +-
.../catalina/tribes/test/TribesTestSuite.java | 40 +-
.../tribes/test/channel/TestDataIntegrity.java | 38 +-
.../test/channel/TestRemoteProcessException.java | 65 +-
.../test/interceptors/TestTwoPhaseCommit.java | 41 -
.../catalina/tribes/test/io/TestSerialization.java | 40 -
.../tribes/test/membership/TestMemberArrival.java | 117 -
.../valves/TestExtendedAccessLogValve.java | 63 +
.../apache/catalina/valves/TestRemoteIpValve.java | 357 +-
test/org/apache/el/TestELEvaluation.java | 75 +-
test/org/apache/el/lang/TestELArithmetic.java | 56 +-
test/org/apache/el/lang/TestELSupport.java | 34 +-
.../jasper/compiler/TestAttributeParser.java | 39 +-
test/org/apache/jasper/compiler/TestELParser.java | 309 ++
.../org/apache/juli/TestClassLoaderLogManager.java | 135 +-
test/org/apache/juli/TestDateFormatCache.java | 109 +
.../apache/tomcat/util/buf/TestB2CConverter.java | 61 +
test/org/apache/tomcat/util/http/TestCookies.java | 37 +-
.../apache/tomcat/util/res/TestStringManager.java | 14 +-
webapps/ROOT/index.html | 65 +-
webapps/ROOT/index.jsp | 87 +-
webapps/docs/appdev/build.xml.txt | 2 -
webapps/docs/appdev/deployment.xml | 12 +-
webapps/docs/appdev/index.xml | 2 +-
webapps/docs/appdev/introduction.xml | 20 +-
webapps/docs/apr.xml | 26 +-
webapps/docs/architecture/overview.xml | 4 +-
.../docs/architecture/startup/serverStartup.txt | 235 +-
webapps/docs/building.xml | 13 +-
webapps/docs/cgi-howto.xml | 47 +-
webapps/docs/changelog.xml | 1678 +++++++-
webapps/docs/class-loader-howto.xml | 4 +-
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/config/ajp.xml | 37 +-
webapps/docs/config/cluster-interceptor.xml | 41 +-
webapps/docs/config/cluster-manager.xml | 69 +-
webapps/docs/config/cluster-membership.xml | 3 +-
webapps/docs/config/cluster-receiver.xml | 2 +-
webapps/docs/config/cluster-sender.xml | 2 +-
webapps/docs/config/cluster.xml | 15 +-
webapps/docs/config/context.xml | 240 +-
webapps/docs/config/executor.xml | 7 +-
webapps/docs/config/filter.xml | 59 +-
webapps/docs/config/host.xml | 12 +-
webapps/docs/config/http.xml | 117 +-
webapps/docs/config/listeners.xml | 61 +-
webapps/docs/config/manager.xml | 96 +-
webapps/docs/config/project.xml | 7 +-
webapps/docs/config/realm.xml | 174 +-
webapps/docs/config/systemprops.xml | 79 +
webapps/docs/config/valve.xml | 318 +-
webapps/docs/default-servlet.xml | 31 +-
webapps/docs/deployer-howto.xml | 45 +-
webapps/docs/funcspecs/fs-admin-apps.xml | 1 -
webapps/docs/funcspecs/fs-admin-objects.xml | 3 +-
webapps/docs/funcspecs/fs-admin-opers.xml | 1 -
webapps/docs/funcspecs/fs-default.xml | 3 +-
webapps/docs/funcspecs/fs-invoker.xml | 3 +-
webapps/docs/funcspecs/fs-jdbc-realm.xml | 3 +-
webapps/docs/funcspecs/fs-jndi-realm.xml | 7 +-
webapps/docs/funcspecs/fs-memory-realm.xml | 3 +-
webapps/docs/funcspecs/mbean-names.xml | 1 -
webapps/docs/html-manager-howto.xml | 10 +-
webapps/docs/index.xml | 4 +-
webapps/docs/jasper-howto.xml | 12 +-
webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 23 +-
webapps/docs/logging.xml | 4 +-
webapps/docs/manager-howto.xml | 562 +--
webapps/docs/monitoring.xml | 518 +--
webapps/docs/proxy-howto.xml | 2 +-
webapps/docs/realm-howto.xml | 19 +-
webapps/docs/security-manager-howto.xml | 2 +-
webapps/docs/setup.xml | 29 +-
webapps/docs/ssi-howto.xml | 4 +-
webapps/docs/ssl-howto.xml | 169 +-
webapps/docs/tomcat-docs.xsl | 71 +-
webapps/docs/tribes/introduction.xml | 2 +-
webapps/docs/tribes/tomcat-docs.xsl | 6 +-
webapps/docs/windows-service-howto.xml | 351 +-
.../examples/WEB-INF/classes/CookieExample.java | 6 +-
.../WEB-INF/classes/HelloWorldExample.java | 3 -
.../WEB-INF/classes/LocalStrings.properties | 2 -
.../WEB-INF/classes/LocalStrings_en.properties | 2 -
.../WEB-INF/classes/LocalStrings_es.properties | 2 -
.../WEB-INF/classes/LocalStrings_fr.properties | 2 -
.../WEB-INF/classes/LocalStrings_pt.properties | 2 -
.../WEB-INF/classes/RequestHeaderExample.java | 6 +-
.../WEB-INF/classes/RequestInfoExample.java | 47 +-
.../WEB-INF/classes/RequestParamExample.java | 4 -
.../examples/WEB-INF/classes/SessionExample.java | 13 +-
.../compressionFilters/CompressionFilter.java | 5 +-
.../CompressionFilterTestServlet.java | 2 -
.../CompressionResponseStream.java | 2 -
.../CompressionServletResponseWrapper.java | 2 -
.../WEB-INF/classes/filters/ExampleFilter.java | 2 -
.../classes/filters/RequestDumperFilter.java | 2 -
.../filters/SetCharacterEncodingFilter.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 -
.../WEB-INF/lib/taglibs-standard-impl-1.2.5.jar | Bin 0 -> 206430 bytes
.../WEB-INF/lib/taglibs-standard-spec-1.2.5.jar | Bin 0 -> 40153 bytes
webapps/examples/jsp/cal/login.html | 2 +-
webapps/examples/jsp/jsp2/jspx/svgexample.html | 2 +-
webapps/examples/jsp/jsp2/jspx/textRotate.jspx | 2 +-
webapps/host-manager/META-INF/context.xml | 11 +-
webapps/host-manager/{ => WEB-INF/jsp}/401.jsp | 6 +-
webapps/host-manager/{ => WEB-INF/jsp}/403.jsp | 6 +-
webapps/host-manager/WEB-INF/web.xml | 9 +
.../{META-INF/context.xml => index.jsp} | 8 +-
webapps/host-manager/manager.xml | 4 -
webapps/manager/META-INF/context.xml | 11 +-
webapps/manager/{ => WEB-INF/jsp}/401.jsp | 4 +-
webapps/manager/{ => WEB-INF/jsp}/403.jsp | 4 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
webapps/manager/WEB-INF/web.xml | 4 +-
.../META-INF/context.xml => manager/index.jsp} | 8 +-
webapps/manager/status.xsd | 125 +-
webapps/manager/xform.xsl | 75 +-
998 files changed, 33672 insertions(+), 11919 deletions(-)
--
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