This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch experimental in repository tomcat8.
commit d4fd9d20ed4ad97080eab4eb17587e9defd7090e Merge: 287a102 d8d9950 Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Nov 16 18:47:00 2016 +0100 Merge tag 'upstream/8.5.8' Upstream version 8.5.8 BUILDING.txt | 98 +- KEYS | 60 - LICENSE | 4 + NOTICE | 18 +- RELEASE-NOTES | 11 +- RUNNING.txt | 6 - TOMCAT-NEXT.txt | 224 - bin/catalina-tasks.xml | 2 +- bin/catalina.bat | 14 +- bin/catalina.sh | 33 +- bin/daemon.sh | 3 - bin/service.bat | 2 +- bin/setclasspath.bat | 10 +- bin/setclasspath.sh | 11 +- bin/tool-wrapper.bat | 8 +- bin/tool-wrapper.sh | 9 +- build.properties.default | 55 +- build.xml | 335 +- conf/catalina.policy | 7 +- conf/catalina.properties | 4 +- conf/context.xml | 8 +- conf/jaspic-providers.xml | 23 + conf/jaspic-providers.xsd | 53 + conf/logging.properties | 6 + conf/server.xml | 36 +- conf/tomcat-users.xml | 2 +- conf/tomcat-users.xsd | 2 +- conf/web.xml | 5 +- java/javax/el/ArrayELResolver.java | 17 +- java/javax/el/BeanELResolver.java | 21 +- java/javax/el/BeanNameELResolver.java | 21 +- java/javax/el/CompositeELResolver.java | 7 +- java/javax/el/ELContext.java | 10 +- java/javax/el/LambdaExpression.java | 5 +- java/javax/el/ListELResolver.java | 17 +- java/javax/el/MapELResolver.java | 17 +- java/javax/el/ResourceBundleELResolver.java | 18 +- java/javax/el/StaticFieldELResolver.java | 24 +- .../javax/security/auth/message/AuthException.java | 30 + java/javax/security/auth/message/AuthStatus.java | 37 + java/javax/security/auth/message/ClientAuth.java | 30 + java/javax/security/auth/message/MessageInfo.java | 33 + .../javax/security/auth/message/MessagePolicy.java | 85 + java/javax/security/auth/message/ServerAuth.java | 29 + .../message/callback/CallerPrincipalCallback.java | 57 + .../auth/message/callback/CertStoreCallback.java | 41 + .../message/callback/GroupPrincipalCallback.java | 43 + .../callback/PasswordValidationCallback.java | 65 + .../auth/message/callback/PrivateKeyCallback.java | 123 + .../auth/message/callback/SecretKeyCallback.java | 62 + .../auth/message/callback/TrustStoreCallback.java | 38 + .../security/auth/message/config/AuthConfig.java | 32 + .../auth/message/config/AuthConfigFactory.java | 149 + .../auth/message/config/AuthConfigProvider.java | 31 + .../auth/message/config/ClientAuthConfig.java | 29 + .../auth/message/config/ClientAuthContext.java | 22 + .../auth/message/config/RegistrationListener.java | 22 + .../auth/message/config/ServerAuthConfig.java | 29 + .../auth/message/config/ServerAuthContext.java | 22 + .../auth/message/module/ClientAuthModule.java | 34 + .../auth/message/module/ServerAuthModule.java | 34 + java/javax/servlet/http/Cookie.java | 27 +- java/javax/servlet/http/HttpSessionListener.java | 1 - .../servlet/jsp/el/ImplicitObjectELResolver.java | 27 +- .../servlet/jsp/el/ScopedAttributeELResolver.java | 17 +- java/javax/websocket/WebSocketContainer.java | 4 +- java/org/apache/catalina/AccessLog.java | 1 + java/org/apache/catalina/Context.java | 215 +- java/org/apache/catalina/Engine.java | 14 +- java/org/apache/catalina/Executor.java | 5 +- java/org/apache/catalina/Globals.java | 43 - java/org/apache/catalina/Group.java | 20 +- java/org/apache/catalina/Host.java | 36 +- java/org/apache/catalina/InstanceEvent.java | 397 -- java/org/apache/catalina/InstanceListener.java | 43 - java/org/apache/catalina/JmxEnabled.java | 7 +- java/org/apache/catalina/LifecycleEvent.java | 35 +- java/org/apache/catalina/LifecycleState.java | 28 +- java/org/apache/catalina/Manager.java | 132 +- java/org/apache/catalina/Realm.java | 8 + java/org/apache/catalina/Service.java | 19 +- java/org/apache/catalina/Session.java | 42 +- java/org/apache/catalina/SessionEvent.java | 9 +- java/org/apache/catalina/SessionIdGenerator.java | 7 +- java/org/apache/catalina/Store.java | 9 +- java/org/apache/catalina/StoreManager.java | 2 +- java/org/apache/catalina/TomcatPrincipal.java | 4 +- java/org/apache/catalina/User.java | 14 +- java/org/apache/catalina/UserDatabase.java | 17 +- java/org/apache/catalina/Valve.java | 24 +- java/org/apache/catalina/WebResource.java | 42 +- java/org/apache/catalina/WebResourceRoot.java | 29 +- java/org/apache/catalina/WebResourceSet.java | 2 + java/org/apache/catalina/Wrapper.java | 94 +- .../catalina/ant/AbstractCatalinaCommandTask.java | 2 + .../catalina/ant/BaseRedirectorHelperTask.java | 9 +- java/org/apache/catalina/ant/FindLeaksTask.java | 5 + java/org/apache/catalina/ant/ValidatorTask.java | 2 +- .../catalina/ant/jmx/JMXAccessorConditionBase.java | 4 +- .../catalina/ant/jmx/JMXAccessorCreateTask.java | 25 +- .../catalina/ant/jmx/JMXAccessorGetTask.java | 20 +- .../catalina/ant/jmx/JMXAccessorInvokeTask.java | 16 +- .../catalina/ant/jmx/JMXAccessorQueryTask.java | 94 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 28 +- .../apache/catalina/ant/jmx/JMXAccessorTask.java | 63 +- .../ant/jmx/JMXAccessorUnregisterTask.java | 19 +- .../catalina/authenticator/AuthenticatorBase.java | 746 ++- .../catalina/authenticator/BasicAuthenticator.java | 19 +- .../apache/catalina/authenticator/Constants.java | 13 +- .../authenticator/DigestAuthenticator.java | 15 +- .../catalina/authenticator/FormAuthenticator.java | 61 +- .../catalina/authenticator/LocalStrings.properties | 3 + .../authenticator/NonLoginAuthenticator.java | 2 +- .../catalina/authenticator/SSLAuthenticator.java | 6 +- .../catalina/authenticator/SingleSignOn.java | 2 +- .../catalina/authenticator/SingleSignOnEntry.java | 13 +- .../authenticator/SpnegoAuthenticator.java | 10 +- .../jaspic/AuthConfigFactoryImpl.java | 296 + .../authenticator/jaspic/CallbackHandlerImpl.java | 119 + .../authenticator/jaspic/LocalStrings.properties | 28 + .../authenticator/jaspic/MessageInfoImpl.java | 80 + .../jaspic/PersistentProviderRegistrations.java | 257 + .../jaspic/SimpleAuthConfigProvider.java | 89 + .../jaspic/SimpleServerAuthConfig.java | 148 + .../jaspic/SimpleServerAuthContext.java | 74 + .../catalina/authenticator/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/comet/CometEvent.java | 146 - java/org/apache/catalina/comet/CometFilter.java | 81 - .../apache/catalina/comet/CometFilterChain.java | 45 - java/org/apache/catalina/comet/CometProcessor.java | 45 - .../apache/catalina/connector/CometEventImpl.java | 148 - java/org/apache/catalina/connector/Connector.java | 425 +- java/org/apache/catalina/connector/Constants.java | 26 - .../apache/catalina/connector/CoyoteAdapter.java | 311 +- .../catalina/connector/CoyoteInputStream.java | 164 +- .../catalina/connector/CoyoteOutputStream.java | 22 +- .../org/apache/catalina/connector/InputBuffer.java | 430 +- .../catalina/connector/LocalStrings.properties | 7 +- .../catalina/connector/LocalStrings_es.properties | 1 - .../apache/catalina/connector/OutputBuffer.java | 523 +- java/org/apache/catalina/connector/Request.java | 400 +- .../apache/catalina/connector/RequestFacade.java | 43 +- java/org/apache/catalina/connector/Response.java | 143 +- .../apache/catalina/connector/ResponseFacade.java | 10 +- .../catalina/connector/mbeans-descriptors.xml | 2 +- .../org/apache/catalina/core/AccessLogAdapter.java | 9 +- .../apache/catalina/core/ApplicationContext.java | 347 +- .../catalina/core/ApplicationContextFacade.java | 27 +- .../catalina/core/ApplicationDispatcher.java | 56 +- .../catalina/core/ApplicationFilterChain.java | 314 +- .../catalina/core/ApplicationFilterConfig.java | 6 +- .../catalina/core/ApplicationFilterFactory.java | 117 +- .../catalina/core/ApplicationHttpRequest.java | 91 +- .../apache/catalina/core/ApplicationMapping.java | 115 + .../catalina/core/ApplicationPushBuilder.java | 479 ++ .../apache/catalina/core/ApplicationRequest.java | 4 +- .../core/ApplicationSessionCookieConfig.java | 1 + .../apache/catalina/core/AprLifecycleListener.java | 33 +- .../org/apache/catalina/core/AsyncContextImpl.java | 62 +- java/org/apache/catalina/core/Constants.java | 6 +- java/org/apache/catalina/core/ContainerBase.java | 32 +- .../catalina/core/DefaultInstanceManager.java | 2 + .../core/JreMemoryLeakPreventionListener.java | 12 +- .../apache/catalina/core/LocalStrings.properties | 24 +- .../catalina/core/NamingContextListener.java | 116 +- java/org/apache/catalina/core/StandardContext.java | 487 +- .../apache/catalina/core/StandardContextValve.java | 27 +- .../apache/catalina/core/StandardEngineValve.java | 22 - java/org/apache/catalina/core/StandardHost.java | 63 +- .../apache/catalina/core/StandardHostValve.java | 51 +- java/org/apache/catalina/core/StandardServer.java | 46 +- java/org/apache/catalina/core/StandardService.java | 135 +- java/org/apache/catalina/core/StandardWrapper.java | 148 +- .../catalina/core/StandardWrapperFacade.java | 4 +- .../apache/catalina/core/StandardWrapperValve.java | 191 +- .../core/ThreadLocalLeakPreventionListener.java | 3 +- .../apache/catalina/core/mbeans-descriptors.xml | 53 +- java/org/apache/catalina/deploy/Constants.java | 26 - .../catalina/deploy/NamingResourcesImpl.java | 41 +- .../apache/catalina/deploy/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/filters/Constants.java | 2 - java/org/apache/catalina/filters/CorsFilter.java | 173 +- .../catalina/filters/CsrfPreventionFilterBase.java | 4 +- .../org/apache/catalina/filters/ExpiresFilter.java | 31 +- .../catalina/filters/FailedRequestFilter.java | 18 +- java/org/apache/catalina/filters/FilterBase.java | 2 +- .../catalina/filters/LocalStrings.properties | 2 +- .../apache/catalina/filters/RemoteAddrFilter.java | 22 - .../apache/catalina/filters/RemoteHostFilter.java | 22 - .../apache/catalina/filters/RemoteIpFilter.java | 31 +- .../org/apache/catalina/filters/RequestFilter.java | 37 +- .../filters/SetCharacterEncodingFilter.java | 1 + .../apache/catalina/filters/WebdavFixFilter.java | 5 +- java/org/apache/catalina/ha/CatalinaCluster.java | 24 +- java/org/apache/catalina/ha/ClusterDeployer.java | 2 +- java/org/apache/catalina/ha/ClusterListener.java | 5 +- java/org/apache/catalina/ha/ClusterManager.java | 2 +- .../org/apache/catalina/ha/ClusterMessageBase.java | 15 +- .../ha/authenticator/ClusterSingleSignOn.java | 3 +- .../ha/authenticator/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/ha/backend/Sender.java | 10 +- java/org/apache/catalina/ha/backend/TcpSender.java | 1 + .../catalina/ha/context/ReplicatedContext.java | 4 +- java/org/apache/catalina/ha/deploy/Constants.java | 27 - .../apache/catalina/ha/deploy/FarmWarDeployer.java | 45 +- .../catalina/ha/deploy/FileMessageFactory.java | 12 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 5 +- .../catalina/ha/deploy/mbeans-descriptors.xml | 2 +- .../apache/catalina/ha/session/BackupManager.java | 4 +- .../catalina/ha/session/ClusterManagerBase.java | 45 - .../ha/session/ClusterSessionListener.java | 4 +- java/org/apache/catalina/ha/session/Constants.java | 32 - .../apache/catalina/ha/session/DeltaManager.java | 182 +- .../apache/catalina/ha/session/DeltaRequest.java | 10 +- .../apache/catalina/ha/session/DeltaSession.java | 20 +- .../catalina/ha/session/JvmRouteBinderValve.java | 7 +- .../catalina/ha/session/LocalStrings.properties | 2 +- .../catalina/ha/session/mbeans-descriptors.xml | 24 - .../apache/catalina/ha/tcp/LocalStrings.properties | 2 +- .../apache/catalina/ha/tcp/ReplicationValve.java | 46 +- .../apache/catalina/ha/tcp/SendMessageData.java | 12 +- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 22 +- .../apache/catalina/loader/JdbcLeakPrevention.java | 2 +- .../catalina/loader/ParallelWebappClassLoader.java | 5 +- java/org/apache/catalina/loader/ResourceEntry.java | 22 +- .../catalina/loader/WebappClassLoaderBase.java | 662 +- java/org/apache/catalina/loader/WebappLoader.java | 50 +- .../apache/catalina/loader/mbeans-descriptors.xml | 2 +- .../catalina/manager/HTMLManagerServlet.java | 60 +- .../apache/catalina/manager/JMXProxyServlet.java | 117 +- java/org/apache/catalina/manager/JspHelper.java | 6 +- .../catalina/manager/LocalStrings.properties | 2 +- .../apache/catalina/manager/ManagerServlet.java | 85 +- .../apache/catalina/manager/StatusTransformer.java | 69 +- .../apache/catalina/manager/host/Constants.java | 32 - .../manager/host/HTMLHostManagerServlet.java | 69 +- .../catalina/manager/host/HostManagerServlet.java | 68 +- .../catalina/manager/host/LocalStrings.properties | 7 + .../manager/util/BaseSessionComparator.java | 5 +- .../apache/catalina/manager/util/SessionUtils.java | 20 +- java/org/apache/catalina/mapper/Mapper.java | 167 +- .../org/apache/catalina/mapper/MapperListener.java | 17 +- java/org/apache/catalina/mapper/MappingData.java | 6 +- .../apache/catalina/mapper/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/mbeans/Constants.java | 27 - java/org/apache/catalina/mbeans/MBeanFactory.java | 21 +- .../apache/catalina/mbeans/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/realm/Constants.java | 9 +- .../realm/DigestCredentialHandlerBase.java | 3 +- .../apache/catalina/realm/JAASCallbackHandler.java | 3 +- .../catalina/realm/JAASMemoryLoginModule.java | 14 +- java/org/apache/catalina/realm/JNDIRealm.java | 52 +- .../apache/catalina/realm/LocalStrings.properties | 1 + java/org/apache/catalina/realm/RealmBase.java | 319 +- .../apache/catalina/realm/mbeans-descriptors.xml | 66 +- .../catalina/security/SecurityClassLoad.java | 36 +- .../apache/catalina/security/SecurityConfig.java | 5 +- .../org/apache/catalina/security/SecurityUtil.java | 27 +- .../catalina/servlet4preview/GenericFilter.java | 86 + .../servlet4preview/RequestDispatcher.java | 47 + .../catalina/servlet4preview/http/HttpFilter.java | 96 + .../servlet4preview/http/HttpServletRequest.java | 48 + .../http/HttpServletRequestWrapper.java | 81 + .../catalina/servlet4preview/http/Mapping.java | 51 + .../servlet4preview/http/MappingMatch.java | 32 + .../catalina/servlet4preview/http/PushBuilder.java | 254 + .../catalina/servlet4preview/package-info.java | 36 + java/org/apache/catalina/servlets/CGIServlet.java | 23 - .../apache/catalina/servlets/DefaultServlet.java | 303 +- .../catalina/servlets/LocalStrings.properties | 2 - .../catalina/servlets/LocalStrings_es.properties | 1 - .../catalina/servlets/LocalStrings_fr.properties | 1 - .../catalina/servlets/LocalStrings_ja.properties | 2 - .../apache/catalina/servlets/WebdavServlet.java | 509 +- .../catalina/session/LocalStrings.properties | 1 - java/org/apache/catalina/session/ManagerBase.java | 196 +- .../catalina/session/PersistentManagerBase.java | 14 +- .../apache/catalina/session/StandardManager.java | 1 + .../apache/catalina/session/StandardSession.java | 30 +- .../apache/catalina/session/mbeans-descriptors.xml | 30 +- .../apache/catalina/ssi/ExpressionParseTree.java | 15 +- .../apache/catalina/ssi/ExpressionTokenizer.java | 9 +- .../catalina/ssi/ResponseIncludeWrapper.java | 1 + java/org/apache/catalina/ssi/SSIFilter.java | 7 - java/org/apache/catalina/ssi/SSIMediator.java | 6 +- java/org/apache/catalina/ssi/SSIProcessor.java | 8 +- java/org/apache/catalina/ssi/SSIServlet.java | 1 + .../catalina/ssi/SSIServletExternalResolver.java | 3 +- .../apache/catalina/ssi/SSIServletRequestUtil.java | 1 + .../catalina/startup/Authenticators.properties | 2 +- java/org/apache/catalina/startup/Bootstrap.java | 14 + java/org/apache/catalina/startup/Catalina.java | 39 +- .../catalina/startup/CatalinaProperties.java | 17 +- .../catalina/startup/CertificateCreateRule.java | 61 + .../catalina/startup/ClassLoaderFactory.java | 11 +- .../catalina/startup/ConnectorCreateRule.java | 23 +- .../org/apache/catalina/startup/ContextConfig.java | 155 +- .../apache/catalina/startup/ContextRuleSet.java | 6 +- .../org/apache/catalina/startup/EngineRuleSet.java | 2 +- java/org/apache/catalina/startup/ExpandWar.java | 5 + .../org/apache/catalina/startup/FailedContext.java | 7 - java/org/apache/catalina/startup/HostConfig.java | 79 +- .../catalina/startup/LocalStrings.properties | 3 + java/org/apache/catalina/startup/Tomcat.java | 157 +- java/org/apache/catalina/startup/UserConfig.java | 26 +- java/org/apache/catalina/startup/UserDatabase.java | 6 +- .../apache/catalina/startup/WebAnnotationSet.java | 8 + .../catalina/startup/WebappServiceLoader.java | 2 + .../apache/catalina/startup/mbeans-descriptors.xml | 2 +- .../apache/catalina/storeconfig/ConnectorSF.java | 31 +- .../storeconfig/ConnectorStoreAppender.java | 54 +- .../catalina/storeconfig/CredentialHandlerSF.java | 12 +- .../apache/catalina/storeconfig/IStoreConfig.java | 6 + .../catalina/storeconfig/InstanceListenerSF.java | 60 - java/org/apache/catalina/storeconfig/LoaderSF.java | 7 +- .../org/apache/catalina/storeconfig/ManagerSF.java | 7 +- .../catalina/storeconfig/SSLHostConfigSF.java | 45 + .../catalina/storeconfig/StandardContextSF.java | 64 +- .../catalina/storeconfig/StandardServerSF.java | 12 +- .../catalina/storeconfig/StandardServiceSF.java | 22 +- .../apache/catalina/storeconfig/StoreAppender.java | 121 +- .../apache/catalina/storeconfig/StoreConfig.java | 85 +- .../storeconfig/StoreConfigLifecycleListener.java | 26 +- .../catalina/storeconfig/StoreContextAppender.java | 23 +- .../catalina/storeconfig/StoreDescription.java | 8 +- .../catalina/storeconfig/StoreFactoryBase.java | 44 +- .../catalina/storeconfig/StoreFactoryRule.java | 22 +- .../catalina/storeconfig/StoreFileMover.java | 19 +- .../apache/catalina/storeconfig/StoreLoader.java | 37 +- .../apache/catalina/storeconfig/StoreRegistry.java | 31 +- .../catalina/storeconfig/mbeans-descriptors.xml | 2 +- .../catalina/storeconfig/server-registry.xml | 40 +- java/org/apache/catalina/tribes/ByteMessage.java | 4 +- java/org/apache/catalina/tribes/Channel.java | 14 +- .../apache/catalina/tribes/ChannelException.java | 10 +- .../apache/catalina/tribes/ChannelInterceptor.java | 14 +- .../apache/catalina/tribes/ChannelReceiver.java | 14 +- java/org/apache/catalina/tribes/ChannelSender.java | 13 + java/org/apache/catalina/tribes/Member.java | 12 +- .../apache/catalina/tribes/MembershipService.java | 58 +- .../catalina/tribes/group/ChannelCoordinator.java | 18 +- .../tribes/group/ChannelInterceptorBase.java | 4 +- .../apache/catalina/tribes/group/GroupChannel.java | 20 +- .../apache/catalina/tribes/group/RpcCallback.java | 9 +- .../apache/catalina/tribes/group/RpcChannel.java | 5 +- .../interceptors/DomainFilterInterceptor.java | 3 +- .../interceptors/FragmentationInterceptor.java | 4 +- .../tribes/group/interceptors/GzipInterceptor.java | 5 +- .../group/interceptors/LocalStrings.properties | 1 + .../interceptors/MessageDispatch15Interceptor.java | 28 - .../interceptors/MessageDispatchInterceptor.java | 55 +- .../group/interceptors/NonBlockingCoordinator.java | 37 +- .../group/interceptors/OrderInterceptor.java | 3 +- .../group/interceptors/SimpleCoordinator.java | 2 +- .../interceptors/StaticMembershipInterceptor.java | 13 +- .../group/interceptors/TcpFailureDetector.java | 9 +- .../group/interceptors/TcpPingInterceptor.java | 9 +- .../group/interceptors/ThroughputInterceptor.java | 3 +- .../interceptors/TwoPhaseCommitInterceptor.java | 3 +- java/org/apache/catalina/tribes/io/BufferPool.java | 3 +- .../tribes/io/DirectByteArrayOutputStream.java | 1 - .../apache/catalina/tribes/io/ObjectReader.java | 9 +- .../catalina/tribes/io/ReplicationStream.java | 3 +- .../org/apache/catalina/tribes/io/XByteBuffer.java | 47 +- .../catalina/tribes/membership/McastService.java | 17 +- .../tribes/membership/McastServiceImpl.java | 43 +- .../catalina/tribes/membership/MemberImpl.java | 2 + .../catalina/tribes/membership/Membership.java | 21 +- .../tribes/tipis/AbstractReplicatedMap.java | 30 +- .../catalina/tribes/tipis/LazyReplicatedMap.java | 14 +- .../catalina/tribes/tipis/ReplicatedMap.java | 13 +- .../catalina/tribes/tipis/ReplicatedMapEntry.java | 17 +- .../catalina/tribes/transport/PooledSender.java | 3 +- .../catalina/tribes/transport/ReceiverBase.java | 20 +- .../tribes/transport/ReplicationTransmitter.java | 2 + .../catalina/tribes/transport/RxTaskPool.java | 2 + .../catalina/tribes/transport/SenderState.java | 3 +- .../catalina/tribes/transport/bio/BioReceiver.java | 9 +- .../tribes/transport/bio/BioReplicationTask.java | 10 +- .../catalina/tribes/transport/bio/BioSender.java | 27 +- .../tribes/transport/bio/PooledMultiSender.java | 11 +- .../tribes/transport/bio/util/FastQueue.java | 300 - .../tribes/transport/bio/util/LinkObject.java | 107 - .../transport/bio/util/LocalStrings.properties | 21 - .../bio/util/SingleRemoveSynchronizedAddLock.java | 256 - .../catalina/tribes/transport/nio/NioReceiver.java | 27 +- .../tribes/transport/nio/NioReplicationTask.java | 20 +- .../catalina/tribes/transport/nio/NioSender.java | 12 +- .../tribes/transport/nio/ParallelNioSender.java | 10 +- .../tribes/transport/nio/PooledParallelSender.java | 3 +- java/org/apache/catalina/tribes/util/Arrays.java | 2 +- .../catalina/tribes/util/ExecutorFactory.java | 2 +- .../apache/catalina/tribes/util/StringManager.java | 176 +- .../apache/catalina/tribes/util/UUIDGenerator.java | 4 +- java/org/apache/catalina/users/MemoryUser.java | 1 + .../apache/catalina/users/MemoryUserDatabase.java | 13 +- .../apache/catalina/users/mbeans-descriptors.xml | 2 +- java/org/apache/catalina/util/CharsetMapper.java | 1 + java/org/apache/catalina/util/Conversions.java | 42 - .../catalina/util/CustomObjectInputStream.java | 15 +- java/org/apache/catalina/util/DOMWriter.java | 52 +- java/org/apache/catalina/util/Extension.java | 28 +- .../apache/catalina/util/ExtensionValidator.java | 7 +- java/org/apache/catalina/util/IOTools.java | 30 +- java/org/apache/catalina/util/InstanceSupport.java | 342 - java/org/apache/catalina/util/Introspection.java | 16 +- java/org/apache/catalina/util/LifecycleBase.java | 29 +- .../org/apache/catalina/util/LifecycleSupport.java | 108 - .../apache/catalina/util/LocalStrings.properties | 2 - java/org/apache/catalina/util/MIME2Java.java | 510 +- java/org/apache/catalina/util/ParameterMap.java | 5 +- java/org/apache/catalina/util/RequestUtil.java | 186 +- java/org/apache/catalina/util/ResourceSet.java | 4 +- java/org/apache/catalina/util/ServerInfo.java | 10 +- java/org/apache/catalina/util/SessionConfig.java | 6 +- .../catalina/util/SessionIdGeneratorBase.java | 87 +- java/org/apache/catalina/util/Strftime.java | 1 + java/org/apache/catalina/util/StringParser.java | 198 - java/org/apache/catalina/util/UriUtil.java | 42 - java/org/apache/catalina/util/XMLWriter.java | 14 +- .../catalina/valves/AbstractAccessLogValve.java | 35 +- .../org/apache/catalina/valves/AccessLogValve.java | 22 +- .../valves/CometConnectionManagerValve.java | 343 - .../apache/catalina/valves/ErrorReportValve.java | 6 +- .../apache/catalina/valves/JDBCAccessLogValve.java | 27 +- .../apache/catalina/valves/LocalStrings.properties | 2 - .../catalina/valves/LocalStrings_es.properties | 2 - .../apache/catalina/valves/PersistentValve.java | 3 + .../apache/catalina/valves/RemoteAddrValve.java | 2 + .../apache/catalina/valves/RemoteHostValve.java | 1 + java/org/apache/catalina/valves/RemoteIpValve.java | 16 +- .../apache/catalina/valves/RequestFilterValve.java | 14 +- .../org/apache/catalina/valves/SemaphoreValve.java | 14 +- java/org/apache/catalina/valves/ValveBase.java | 101 +- .../apache/catalina/valves/mbeans-descriptors.xml | 2 +- .../catalina/valves/rewrite/RewriteCond.java | 2 + .../catalina/valves/rewrite/RewriteRule.java | 5 +- .../catalina/valves/rewrite/RewriteValve.java | 31 +- .../catalina/valves/rewrite/Substitution.java | 5 +- .../catalina/valves/rewrite/mbeans-descriptors.xml | 2 +- .../catalina/webresources/AbstractResource.java | 3 +- .../catalina/webresources/AbstractResourceSet.java | 3 +- java/org/apache/catalina/webresources/Cache.java | 3 +- .../webresources/ClasspathURLStreamHandler.java | 2 +- .../apache/catalina/webresources/Constants.java | 22 - .../apache/catalina/webresources/FileResource.java | 55 +- .../apache/catalina/webresources/StandardRoot.java | 12 +- .../catalina/webresources/mbeans-descriptors.xml | 2 +- java/org/apache/coyote/AbstractProcessor.java | 649 +- java/org/apache/coyote/AbstractProcessorLight.java | 155 + java/org/apache/coyote/AbstractProtocol.java | 564 +- java/org/apache/coyote/ActionCode.java | 57 +- java/org/apache/coyote/ActionHook.java | 3 - java/org/apache/coyote/Adapter.java | 9 +- java/org/apache/coyote/AsyncContextCallback.java | 2 +- java/org/apache/coyote/AsyncStateMachine.java | 27 +- java/org/apache/coyote/ByteBufferHolder.java | 64 - java/org/apache/coyote/CloseNowException.java | 51 + java/org/apache/coyote/Constants.java | 65 +- java/org/apache/coyote/ErrorState.java | 36 +- java/org/apache/coyote/InputBuffer.java | 52 +- java/org/apache/coyote/LocalStrings.properties | 7 + java/org/apache/coyote/LocalStrings_es.properties | 3 + java/org/apache/coyote/OutputBuffer.java | 34 +- java/org/apache/coyote/Processor.java | 89 +- java/org/apache/coyote/ProtocolException.java | 42 + java/org/apache/coyote/ProtocolHandler.java | 40 +- java/org/apache/coyote/PushToken.java | 44 + java/org/apache/coyote/Request.java | 134 +- java/org/apache/coyote/RequestGroupInfo.java | 51 +- java/org/apache/coyote/RequestInfo.java | 4 +- java/org/apache/coyote/Response.java | 97 +- java/org/apache/coyote/UpgradeProtocol.java | 93 + .../apache/coyote/ajp/AbstractAjpProcessor.java | 1841 ------ .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 124 +- java/org/apache/coyote/ajp/AjpAprProcessor.java | 285 - java/org/apache/coyote/ajp/AjpAprProtocol.java | 95 +- java/org/apache/coyote/ajp/AjpMessage.java | 93 +- java/org/apache/coyote/ajp/AjpNio2Processor.java | 265 - java/org/apache/coyote/ajp/AjpNio2Protocol.java | 112 +- java/org/apache/coyote/ajp/AjpNioProcessor.java | 216 - java/org/apache/coyote/ajp/AjpNioProtocol.java | 139 +- java/org/apache/coyote/ajp/AjpProcessor.java | 1466 ++++- java/org/apache/coyote/ajp/AjpProtocol.java | 144 - java/org/apache/coyote/ajp/Constants.java | 7 - java/org/apache/coyote/ajp/LocalStrings.properties | 8 +- .../coyote/http11/AbstractHttp11JsseProtocol.java | 106 +- .../coyote/http11/AbstractHttp11Processor.java | 1865 ------ .../coyote/http11/AbstractHttp11Protocol.java | 451 +- .../apache/coyote/http11/AbstractInputBuffer.java | 365 -- .../coyote/http11/AbstractNioInputBuffer.java | 667 -- .../apache/coyote/http11/AbstractOutputBuffer.java | 655 -- java/org/apache/coyote/http11/Constants.java | 60 +- .../apache/coyote/http11/Http11AprProcessor.java | 520 -- .../apache/coyote/http11/Http11AprProtocol.java | 270 +- .../apache/coyote/http11/Http11InputBuffer.java | 1093 ++++ .../apache/coyote/http11/Http11Nio2Processor.java | 589 -- .../apache/coyote/http11/Http11Nio2Protocol.java | 218 +- .../apache/coyote/http11/Http11NioProcessor.java | 573 -- .../apache/coyote/http11/Http11NioProtocol.java | 227 +- .../apache/coyote/http11/Http11OutputBuffer.java | 594 ++ java/org/apache/coyote/http11/Http11Processor.java | 1797 +++++- java/org/apache/coyote/http11/Http11Protocol.java | 191 - java/org/apache/coyote/http11/InputFilter.java | 31 +- .../coyote/http11/InternalAprInputBuffer.java | 709 --- .../coyote/http11/InternalAprOutputBuffer.java | 365 -- .../apache/coyote/http11/InternalInputBuffer.java | 592 -- .../coyote/http11/InternalNio2InputBuffer.java | 352 -- .../coyote/http11/InternalNio2OutputBuffer.java | 546 -- .../coyote/http11/InternalNioInputBuffer.java | 188 - .../coyote/http11/InternalNioOutputBuffer.java | 336 - .../apache/coyote/http11/InternalOutputBuffer.java | 243 - .../apache/coyote/http11/LocalStrings.properties | 12 +- .../coyote/http11/LocalStrings_es.properties | 1 - java/org/apache/coyote/http11/OutputFilter.java | 22 +- .../coyote/http11/filters/BufferedInputFilter.java | 75 +- .../coyote/http11/filters/ChunkedInputFilter.java | 200 +- .../coyote/http11/filters/ChunkedOutputFilter.java | 96 +- .../coyote/http11/filters/GzipOutputFilter.java | 46 +- .../coyote/http11/filters/IdentityInputFilter.java | 78 +- .../http11/filters/IdentityOutputFilter.java | 52 +- .../http11/filters/SavedRequestInputFilter.java | 20 +- .../coyote/http11/filters/VoidInputFilter.java | 13 +- .../coyote/http11/filters/VoidOutputFilter.java | 16 +- .../coyote/http11/upgrade/AbstractProcessor.java | 190 - .../http11/upgrade/AbstractServletInputStream.java | 250 - .../upgrade/AbstractServletOutputStream.java | 268 - .../apache/coyote/http11/upgrade/AprProcessor.java | 45 - .../http11/upgrade/AprServletInputStream.java | 151 - .../http11/upgrade/AprServletOutputStream.java | 168 - .../apache/coyote/http11/upgrade/BioProcessor.java | 44 - .../http11/upgrade/BioServletInputStream.java | 67 - .../http11/upgrade/BioServletOutputStream.java | 51 - .../apache/coyote/http11/upgrade/Constants.java | 22 - .../http11/upgrade/InternalHttpUpgradeHandler.java | 40 + .../coyote/http11/upgrade/LocalStrings.properties | 18 +- .../coyote/http11/upgrade/Nio2Processor.java | 49 - .../http11/upgrade/Nio2ServletInputStream.java | 235 - .../http11/upgrade/Nio2ServletOutputStream.java | 199 - .../apache/coyote/http11/upgrade/NioProcessor.java | 55 - .../http11/upgrade/NioServletInputStream.java | 140 - .../http11/upgrade/NioServletOutputStream.java | 140 - .../http11/upgrade/UpgradeProcessorBase.java | 97 + .../http11/upgrade/UpgradeProcessorExternal.java | 139 + .../http11/upgrade/UpgradeProcessorInternal.java | 95 + .../http11/upgrade/UpgradeServletInputStream.java | 253 + .../http11/upgrade/UpgradeServletOutputStream.java | 282 + java/org/apache/coyote/http2/AbstractStream.java | 149 + java/org/apache/coyote/http2/ByteUtil.java | 94 + .../apache/coyote/http2/ConnectionException.java | 29 + .../coyote/http2/ConnectionSettingsBase.java | 218 + .../coyote/http2/ConnectionSettingsLocal.java | 100 + .../coyote/http2/ConnectionSettingsRemote.java | 34 + java/org/apache/coyote/http2/Constants.java | 33 + java/org/apache/coyote/http2/Flags.java | 49 + java/org/apache/coyote/http2/FrameType.java | 138 + java/org/apache/coyote/http2/HPackHuffman.java | 567 ++ java/org/apache/coyote/http2/HeaderSink.java | 37 + java/org/apache/coyote/http2/Hpack.java | 216 + java/org/apache/coyote/http2/HpackDecoder.java | 453 ++ java/org/apache/coyote/http2/HpackEncoder.java | 398 ++ java/org/apache/coyote/http2/HpackException.java | 36 + java/org/apache/coyote/http2/Http2Error.java | 53 + java/org/apache/coyote/http2/Http2Exception.java | 35 + java/org/apache/coyote/http2/Http2Parser.java | 659 ++ java/org/apache/coyote/http2/Http2Protocol.java | 279 + .../apache/coyote/http2/Http2UpgradeHandler.java | 1560 +++++ .../apache/coyote/http2/LocalStrings.properties | 137 + java/org/apache/coyote/http2/Setting.java | 68 + java/org/apache/coyote/http2/Stream.java | 918 +++ java/org/apache/coyote/http2/StreamException.java | 37 + java/org/apache/coyote/http2/StreamProcessor.java | 266 + .../apache/coyote/http2/StreamStateMachine.java | 257 + java/org/apache/el/lang/ExpressionBuilder.java | 94 +- java/org/apache/el/util/ReflectionUtil.java | 2 +- java/org/apache/jasper/Constants.java | 13 - java/org/apache/jasper/EmbeddedServletOptions.java | 15 +- java/org/apache/jasper/JasperException.java | 11 +- java/org/apache/jasper/JspC.java | 58 +- java/org/apache/jasper/JspCompilationContext.java | 35 +- java/org/apache/jasper/Options.java | 68 +- java/org/apache/jasper/compiler/AntCompiler.java | 3 + .../org/apache/jasper/compiler/BeanRepository.java | 2 + java/org/apache/jasper/compiler/Compiler.java | 51 +- .../apache/jasper/compiler/ELFunctionMapper.java | 1 + java/org/apache/jasper/compiler/ELInterpreter.java | 3 +- .../jasper/compiler/ELInterpreterFactory.java | 3 + java/org/apache/jasper/compiler/ELNode.java | 9 +- java/org/apache/jasper/compiler/ELParser.java | 2 +- .../apache/jasper/compiler/ErrorDispatcher.java | 86 +- java/org/apache/jasper/compiler/ErrorHandler.java | 4 + java/org/apache/jasper/compiler/Generator.java | 40 +- .../jasper/compiler/ImplicitTagLibraryInfo.java | 4 +- java/org/apache/jasper/compiler/JDTCompiler.java | 3 - .../apache/jasper/compiler/JarScannerFactory.java | 2 + java/org/apache/jasper/compiler/JspConfig.java | 2 + .../apache/jasper/compiler/JspRuntimeContext.java | 18 +- java/org/apache/jasper/compiler/JspUtil.java | 36 +- java/org/apache/jasper/compiler/Node.java | 40 +- java/org/apache/jasper/compiler/PageDataImpl.java | 5 +- java/org/apache/jasper/compiler/PageInfo.java | 7 +- java/org/apache/jasper/compiler/Parser.java | 25 +- .../apache/jasper/compiler/ParserController.java | 39 +- java/org/apache/jasper/compiler/ServletWriter.java | 19 +- java/org/apache/jasper/compiler/SmapGenerator.java | 1 + java/org/apache/jasper/compiler/SmapStratum.java | 26 +- java/org/apache/jasper/compiler/SmapUtil.java | 6 +- .../apache/jasper/compiler/TagFileProcessor.java | 16 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 11 +- .../compiler/tagplugin/TagPluginContext.java | 12 +- java/org/apache/jasper/el/ELResolverImpl.java | 17 +- .../jasper/resources/LocalStrings.properties | 6 +- .../jasper/resources/LocalStrings_es.properties | 4 +- .../jasper/resources/LocalStrings_fr.properties | 4 +- .../jasper/resources/LocalStrings_ja.properties | 4 +- .../org/apache/jasper/runtime/BodyContentImpl.java | 69 +- .../apache/jasper/runtime/JspRuntimeLibrary.java | 10 + .../apache/jasper/runtime/JspSourceDependent.java | 1 + java/org/apache/jasper/runtime/JspWriterImpl.java | 7 +- .../org/apache/jasper/runtime/PageContextImpl.java | 1 + .../jasper/runtime/ProtectedFunctionMapper.java | 1 + .../apache/jasper/security/SecurityClassLoad.java | 6 +- java/org/apache/jasper/security/SecurityUtil.java | 2 + java/org/apache/jasper/servlet/JasperLoader.java | 6 +- .../apache/jasper/servlet/JspCServletContext.java | 2 +- java/org/apache/jasper/servlet/JspServlet.java | 33 +- .../apache/jasper/servlet/JspServletWrapper.java | 9 +- java/org/apache/jasper/servlet/TldScanner.java | 10 +- .../apache/jasper/servlet/mbeans-descriptors.xml | 2 +- java/org/apache/jasper/tagplugins/jstl/Util.java | 20 +- .../apache/jasper/tagplugins/jstl/tagPlugins.xml | 2 +- java/org/apache/jasper/xmlparser/EncodingMap.java | 513 +- java/org/apache/jasper/xmlparser/SymbolTable.java | 43 +- java/org/apache/jasper/xmlparser/UCSReader.java | 6 +- java/org/apache/jasper/xmlparser/UTF8Reader.java | 5 +- java/org/apache/jasper/xmlparser/XMLChar.java | 12 +- .../jasper/xmlparser/XMLEncodingDetector.java | 55 +- java/org/apache/jasper/xmlparser/XMLString.java | 24 +- .../apache/jasper/xmlparser/XMLStringBuffer.java | 35 +- java/org/apache/juli/AsyncFileHandler.java | 23 +- java/org/apache/juli/ClassLoaderLogManager.java | 9 +- java/org/apache/juli/DateFormatCache.java | 7 +- java/org/apache/juli/OneLineFormatter.java | 53 +- java/org/apache/juli/logging/DirectJDKLog.java | 7 +- java/org/apache/juli/logging/Log.java | 18 + java/org/apache/juli/logging/LogFactory.java | 10 + java/org/apache/naming/Constants.java | 6 +- .../org/apache/naming/ContextAccessController.java | 25 +- java/org/apache/naming/ContextBindings.java | 44 +- java/org/apache/naming/EjbRef.java | 9 +- java/org/apache/naming/NamingContext.java | 37 +- java/org/apache/naming/ResourceLinkRef.java | 3 + java/org/apache/naming/ResourceRef.java | 9 + java/org/apache/naming/SelectorContext.java | 19 +- java/org/apache/naming/ServiceRef.java | 2 + java/org/apache/naming/factory/FactoryBase.java | 3 +- .../org/apache/naming/factory/SendMailFactory.java | 1 - java/org/apache/tomcat/ContextBind.java | 5 +- .../org/apache/tomcat/InstanceManagerBindings.java | 36 + java/org/apache/tomcat/JarScannerCallback.java | 26 +- java/org/apache/tomcat/buildutil/SignCode.java | 3 + .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 57 +- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 4 +- .../dbcp/dbcp2/DelegatingCallableStatement.java | 2 +- .../tomcat/dbcp/dbcp2/DelegatingConnection.java | 10 +- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 1 + .../dbcp/dbcp2/DelegatingPreparedStatement.java | 2 +- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 9 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 6 +- .../dbcp/dbcp2/LifetimeExceededException.java | 3 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 2 +- .../dbcp/dbcp2/PoolableConnectionFactory.java | 4 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 20 +- .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 2 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java | 16 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 5 + .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 16 +- .../dbcp2/datasources/CPDSConnectionFactory.java | 11 +- .../dbcp2/datasources/InstanceKeyDataSource.java | 61 +- .../datasources/InstanceKeyDataSourceFactory.java | 16 +- .../datasources/KeyedCPDSConnectionFactory.java | 9 +- .../dbcp2/datasources/PerUserPoolDataSource.java | 87 +- .../dbcp2/datasources/SharedPoolDataSource.java | 12 +- .../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 1 - .../dbcp/pool2/impl/SoftReferenceObjectPool.java | 2 +- java/org/apache/tomcat/jni/Address.java | 7 +- java/org/apache/tomcat/jni/Buffer.java | 2 + .../org/apache/tomcat/jni/CertificateVerifier.java | 34 + java/org/apache/tomcat/jni/Directory.java | 11 +- java/org/apache/tomcat/jni/File.java | 33 +- java/org/apache/tomcat/jni/Global.java | 6 + java/org/apache/tomcat/jni/Local.java | 9 +- java/org/apache/tomcat/jni/Lock.java | 10 + java/org/apache/tomcat/jni/Mmap.java | 4 + java/org/apache/tomcat/jni/Multicast.java | 5 + java/org/apache/tomcat/jni/OS.java | 4 + java/org/apache/tomcat/jni/Poll.java | 22 + java/org/apache/tomcat/jni/Pool.java | 1 + java/org/apache/tomcat/jni/Proc.java | 5 + java/org/apache/tomcat/jni/Procattr.java | 14 +- java/org/apache/tomcat/jni/Registry.java | 10 + java/org/apache/tomcat/jni/SSL.java | 372 +- java/org/apache/tomcat/jni/SSLContext.java | 284 +- java/org/apache/tomcat/jni/SSLSocket.java | 21 + java/org/apache/tomcat/jni/Shm.java | 7 +- java/org/apache/tomcat/jni/Socket.java | 70 +- java/org/apache/tomcat/jni/Status.java | 2 +- java/org/apache/tomcat/jni/Stdlib.java | 6 + java/org/apache/tomcat/jni/Thread.java | 2 +- java/org/apache/tomcat/jni/Time.java | 12 +- java/org/apache/tomcat/jni/User.java | 8 + java/org/apache/tomcat/util/Diagnostics.java | 5 +- .../org/apache/tomcat/util/IntrospectionUtils.java | 20 +- java/org/apache/tomcat/util/buf/Ascii.java | 7 +- java/org/apache/tomcat/util/buf/B2CConverter.java | 98 +- .../apache/tomcat/util/buf/ByteBufferHolder.java | 55 + .../apache/tomcat/util/buf/ByteBufferUtils.java | 112 + java/org/apache/tomcat/util/buf/ByteChunk.java | 240 +- java/org/apache/tomcat/util/buf/C2BConverter.java | 86 +- java/org/apache/tomcat/util/buf/CharChunk.java | 131 +- .../apache/tomcat/util/buf/LocalStrings.properties | 2 + java/org/apache/tomcat/util/buf/MessageBytes.java | 58 +- java/org/apache/tomcat/util/buf/StringCache.java | 26 +- java/org/apache/tomcat/util/buf/UDecoder.java | 31 +- java/org/apache/tomcat/util/buf/UEncoder.java | 30 +- .../apache/tomcat/util/codec/binary/Base64.java | 37 +- .../tomcat/util/codec/binary/BaseNCodec.java | 26 +- .../util/collections/CaseInsensitiveKeyMap.java | 208 + .../collections/ManagedConcurrentWeakHashMap.java | 20 +- .../tomcat/util/collections/SynchronizedQueue.java | 2 + .../tomcat/util/collections/SynchronizedStack.java | 8 +- java/org/apache/tomcat/util/compat/Jre8Compat.java | 37 +- java/org/apache/tomcat/util/compat/JreCompat.java | 11 +- .../tomcat/util/descriptor/DigesterFactory.java | 1 + .../tomcat/util/descriptor/LocalResolver.java | 2 +- .../util/descriptor/tld/ImplicitTldRuleSet.java | 3 +- .../util/descriptor/tld/TldResourcePath.java | 8 - .../tomcat/util/descriptor/web/ContextHandler.java | 2 + .../tomcat/util/descriptor/web/ContextService.java | 2 +- .../util/descriptor/web/ContextTransaction.java | 9 +- .../tomcat/util/descriptor/web/ErrorPage.java | 6 +- .../tomcat/util/descriptor/web/FilterMap.java | 3 +- .../descriptor/web/FragmentJarScannerCallback.java | 8 - .../tomcat/util/descriptor/web/ResourceBase.java | 7 +- .../util/descriptor/web/SecurityCollection.java | 29 +- .../util/descriptor/web/SecurityConstraint.java | 136 +- .../tomcat/util/descriptor/web/ServletDef.java | 1 + .../tomcat/util/descriptor/web/WebRuleSet.java | 2 + .../apache/tomcat/util/descriptor/web/WebXml.java | 30 +- .../util/descriptor/web/mbeans-descriptors.xml | 2 +- .../apache/tomcat/util/digester/ArrayStack.java | 2 + .../tomcat/util/digester/CallMethodRule.java | 2 + java/org/apache/tomcat/util/digester/Digester.java | 64 +- .../util/digester/ObjectCreationFactory.java | 8 +- java/org/apache/tomcat/util/digester/Rule.java | 151 +- java/org/apache/tomcat/util/digester/RuleSet.java | 2 +- java/org/apache/tomcat/util/digester/Rules.java | 6 +- .../org/apache/tomcat/util/digester/RulesBase.java | 1 + .../apache/tomcat/util/http/CookieProcessor.java | 17 +- .../org/apache/tomcat/util/http/CookieSupport.java | 175 - .../tomcat/util/http/FastHttpDateFormat.java | 26 +- java/org/apache/tomcat/util/http/HttpMessages.java | 181 - .../tomcat/util/http/LegacyCookieProcessor.java | 47 +- java/org/apache/tomcat/util/http/MimeHeaders.java | 66 +- java/org/apache/tomcat/util/http/Parameters.java | 5 +- .../tomcat/util/http/Rfc6265CookieProcessor.java | 9 +- .../org/apache/tomcat/util/http/ServerCookies.java | 1 + .../apache/tomcat/util/http/SetCookieSupport.java | 49 - .../util/http/fileupload/MultipartStream.java | 2 +- .../tomcat/util/http/parser/Authorization.java | 7 +- .../util/http/parser/LocalStrings.properties | 1 + .../tomcat/util/http/res/LocalStrings.properties | 78 - .../util/http/res/LocalStrings_es.properties | 61 - .../util/http/res/LocalStrings_fr.properties | 61 - .../util/http/res/LocalStrings_ja.properties | 19 - .../apache/tomcat/util/log/SystemLogHandler.java | 9 +- .../apache/tomcat/util/modeler/AttributeInfo.java | 12 +- .../tomcat/util/modeler/BaseAttributeFilter.java | 9 +- .../apache/tomcat/util/modeler/BaseModelMBean.java | 1 + .../apache/tomcat/util/modeler/FeatureInfo.java | 8 +- .../apache/tomcat/util/modeler/ManagedBean.java | 24 +- .../tomcat/util/modeler/NotificationInfo.java | 3 +- .../apache/tomcat/util/modeler/OperationInfo.java | 12 +- .../apache/tomcat/util/modeler/ParameterInfo.java | 1 + java/org/apache/tomcat/util/modeler/Registry.java | 120 +- .../apache/tomcat/util/modeler/RegistryMBean.java | 26 +- .../tomcat/util/modeler/mbeans-descriptors.dtd | 2 +- .../MbeansDescriptorsIntrospectionSource.java | 5 +- .../tomcat/util/modeler/modules/ModelerSource.java | 7 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 513 +- .../tomcat/util/net/AbstractJsseEndpoint.java | 240 + .../tomcat/util/net/ApplicationBufferHandler.java | 33 + java/org/apache/tomcat/util/net/AprEndpoint.java | 1534 +++-- java/org/apache/tomcat/util/net/AprSSLSupport.java | 134 + java/org/apache/tomcat/util/net/Constants.java | 8 +- .../util/net/DefaultServerSocketFactory.java | 67 - java/org/apache/tomcat/util/net/DispatchType.java | 10 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 551 -- .../apache/tomcat/util/net/LocalStrings.properties | 133 + .../tomcat/util/net/LocalStrings_es.properties | 39 + .../util/net/{res => }/LocalStrings_fr.properties | 0 .../util/net/{res => }/LocalStrings_ja.properties | 0 java/org/apache/tomcat/util/net/Nio2Channel.java | 64 +- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1829 ++++-- .../tomcat/util/net/NioBlockingSelector.java | 22 +- java/org/apache/tomcat/util/net/NioChannel.java | 63 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 1152 ++-- .../apache/tomcat/util/net/NioSelectorPool.java | 28 +- java/org/apache/tomcat/util/net/SSLContext.java | 50 + java/org/apache/tomcat/util/net/SSLHostConfig.java | 787 +++ .../tomcat/util/net/SSLHostConfigCertificate.java | 269 + .../apache/tomcat/util/net/SSLImplementation.java | 81 +- java/org/apache/tomcat/util/net/SSLSupport.java | 32 +- java/org/apache/tomcat/util/net/SSLUtil.java | 60 +- java/org/apache/tomcat/util/net/SSLUtilBase.java | 177 + .../apache/tomcat/util/net/SecureNio2Channel.java | 661 +- .../apache/tomcat/util/net/SecureNioChannel.java | 337 +- .../apache/tomcat/util/net/SendfileDataBase.java | 54 + .../tomcat/util/net/ServerSocketFactory.java | 97 - .../tomcat/util/net/SocketBufferHandler.java | 167 + java/org/apache/tomcat/util/net/SocketEvent.java | 64 + .../tomcat/util/net/SocketProcessorBase.java | 55 + .../apache/tomcat/util/net/SocketProperties.java | 24 - java/org/apache/tomcat/util/net/SocketStatus.java | 35 - java/org/apache/tomcat/util/net/SocketWrapper.java | 182 - .../apache/tomcat/util/net/SocketWrapperBase.java | 1071 ++++ .../tomcat/util/net/TLSClientHelloExtractor.java | 252 + java/org/apache/tomcat/util/net/URL.java | 661 -- .../tomcat/util/net/jsse/JSSEImplementation.java | 26 +- .../tomcat/util/net/jsse/JSSEKeyManager.java | 130 +- .../tomcat/util/net/jsse/JSSESSLContext.java | 70 + .../tomcat/util/net/jsse/JSSESocketFactory.java | 858 --- .../apache/tomcat/util/net/jsse/JSSESupport.java | 131 +- java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 374 ++ .../tomcat/util/net/jsse/LocalStrings.properties | 40 + .../util/net/jsse/LocalStrings_es.properties | 17 + .../net/jsse/{res => }/LocalStrings_fr.properties | 0 .../net/jsse/{res => }/LocalStrings_ja.properties | 0 .../tomcat/util/net/jsse/NioX509KeyManager.java | 92 - java/org/apache/tomcat/util/net/jsse/PEMFile.java | 150 + .../util/net/jsse/openssl/Authentication.java | 33 - .../tomcat/util/net/jsse/openssl/Cipher.java | 4746 -------------- .../tomcat/util/net/jsse/openssl/Encryption.java | 41 - .../util/net/jsse/openssl/EncryptionLevel.java | 28 - .../tomcat/util/net/jsse/openssl/KeyExchange.java | 36 - .../util/net/jsse/openssl/MessageDigest.java | 28 - .../openssl/OpenSSLCipherConfigurationParser.java | 804 --- .../tomcat/util/net/jsse/openssl/Protocol.java | 43 - .../util/net/jsse/res/LocalStrings.properties | 37 - .../util/net/jsse/res/LocalStrings_es.properties | 19 - .../util/net/openssl/LocalStrings.properties | 48 + .../tomcat/util/net/openssl/OpenSSLContext.java | 397 ++ .../tomcat/util/net/openssl/OpenSSLEngine.java | 1298 ++++ .../util/net/openssl/OpenSSLImplementation.java | 39 + .../tomcat/util/net/openssl/OpenSSLKeyManager.java | 43 + .../tomcat/util/net/openssl/OpenSSLProtocols.java | 45 + .../util/net/openssl/OpenSSLSessionContext.java | 141 + .../util/net/openssl/OpenSSLSessionStats.java | 126 + .../tomcat/util/net/openssl/OpenSSLUtil.java | 105 + .../util/net/openssl/OpenSSLX509Certificate.java | 190 + .../util/net/openssl/ciphers/Authentication.java | 33 + .../tomcat/util/net/openssl/ciphers/Cipher.java | 4747 ++++++++++++++ .../util/net/openssl/ciphers/Encryption.java | 41 + .../util/net/openssl/ciphers/EncryptionLevel.java | 28 + .../util/net/openssl/ciphers/KeyExchange.java | 36 + .../net/openssl/ciphers/LocalStrings.properties | 16 + .../util/net/openssl/ciphers/MessageDigest.java | 28 + .../ciphers/OpenSSLCipherConfigurationParser.java | 827 +++ .../tomcat/util/net/openssl/ciphers/Protocol.java | 43 + .../tomcat/util/net/res/LocalStrings.properties | 90 - .../tomcat/util/net/res/LocalStrings_es.properties | 36 - java/org/apache/tomcat/util/scan/Constants.java | 7 - java/org/apache/tomcat/util/scan/Jar.java | 33 - .../tomcat/util/scan/StandardJarScanner.java | 4 + java/org/apache/tomcat/util/threads/Constants.java | 2 - .../org/apache/tomcat/util/threads/LimitLatch.java | 5 + .../tomcat/util/threads/ThreadPoolExecutor.java | 2 + .../tomcat/websocket/AsyncChannelGroupUtil.java | 2 +- .../websocket/AsyncChannelWrapperSecure.java | 14 +- .../tomcat/websocket/BackgroundProcessManager.java | 2 +- .../tomcat/websocket/CaseInsensitiveKeyMap.java | 208 - java/org/apache/tomcat/websocket/Constants.java | 42 +- .../tomcat/websocket/FutureToSendHandler.java | 14 +- .../tomcat/websocket/LocalStrings.properties | 10 +- java/org/apache/tomcat/websocket/MessagePart.java | 9 +- .../apache/tomcat/websocket/PerMessageDeflate.java | 15 +- .../websocket/SendHandlerToCompletionHandler.java | 42 - .../tomcat/websocket/TransformationFactory.java | 2 +- java/org/apache/tomcat/websocket/Util.java | 3 +- java/org/apache/tomcat/websocket/WsFrameBase.java | 70 +- .../org/apache/tomcat/websocket/WsFrameClient.java | 18 +- .../tomcat/websocket/WsHandshakeResponse.java | 2 + .../tomcat/websocket/WsRemoteEndpointImplBase.java | 274 +- .../websocket/WsRemoteEndpointImplClient.java | 39 +- java/org/apache/tomcat/websocket/WsSession.java | 30 +- .../tomcat/websocket/WsWebSocketContainer.java | 64 +- .../apache/tomcat/websocket/pojo/Constants.java | 6 +- .../tomcat/websocket/pojo/PojoEndpointBase.java | 3 +- .../tomcat/websocket/pojo/PojoEndpointServer.java | 12 +- .../pojo/PojoMessageHandlerWholeBinary.java | 2 +- .../pojo/PojoMessageHandlerWholeText.java | 2 +- .../tomcat/websocket/pojo/PojoMethodMapping.java | 2 +- .../apache/tomcat/websocket/server/Constants.java | 15 - .../websocket/server/LocalStrings.properties | 3 +- .../tomcat/websocket/server/UpgradeUtil.java | 2 +- .../tomcat/websocket/server/UriTemplate.java | 3 +- .../apache/tomcat/websocket/server/WsFilter.java | 2 - .../tomcat/websocket/server/WsFrameServer.java | 77 +- .../websocket/server/WsHandshakeRequest.java | 2 +- .../websocket/server/WsHttpUpgradeHandler.java | 199 +- .../server/WsRemoteEndpointImplServer.java | 128 +- .../tomcat/websocket/server/WsServerContainer.java | 130 +- modules/bayeux/.classpath | 9 - modules/bayeux/.project | 17 - modules/bayeux/build.xml | 228 - .../java/org/apache/cometd/bayeux/Bayeux.java | 241 - .../java/org/apache/cometd/bayeux/Channel.java | 102 - .../java/org/apache/cometd/bayeux/Client.java | 90 - .../java/org/apache/cometd/bayeux/DataFilter.java | 37 - .../java/org/apache/cometd/bayeux/Listener.java | 44 - .../java/org/apache/cometd/bayeux/Message.java | 67 - .../org/apache/cometd/bayeux/SecurityPolicy.java | 28 - .../org/apache/tomcat/bayeux/BayeuxException.java | 38 - .../org/apache/tomcat/bayeux/BayeuxRequest.java | 53 - .../org/apache/tomcat/bayeux/BayeuxServlet.java | 235 - .../java/org/apache/tomcat/bayeux/ChannelImpl.java | 188 - .../java/org/apache/tomcat/bayeux/ClientImpl.java | 279 - .../java/org/apache/tomcat/bayeux/HttpError.java | 60 - .../java/org/apache/tomcat/bayeux/MessageImpl.java | 80 - .../java/org/apache/tomcat/bayeux/RequestBase.java | 258 - .../org/apache/tomcat/bayeux/RequestFactory.java | 48 - .../org/apache/tomcat/bayeux/TomcatBayeux.java | 175 - .../tomcat/bayeux/request/MetaConnectRequest.java | 124 - .../bayeux/request/MetaDisconnectRequest.java | 104 - .../bayeux/request/MetaHandshakeRequest.java | 115 - .../bayeux/request/MetaSubscribeRequest.java | 129 - .../bayeux/request/MetaUnsubscribeRequest.java | 129 - .../tomcat/bayeux/request/PublishRequest.java | 141 - .../cometd/bayeux/samples/BayeuxStockTicker.java | 232 - .../cometd/bayeux/samples/EchoChatClient.java | 118 - modules/bayeux/webapps/cometd/WEB-INF/web.xml | 53 - .../cometd/examples/simplechat/cometdchat.htm | 130 - .../webapps/cometd/examples/simplechat/ticker.html | 143 - modules/bayeux/webapps/cometd/index.html | 22 - modules/jdbc-pool/build.xml | 2 +- modules/jdbc-pool/doc/changelog.xml | 2 +- modules/jdbc-pool/doc/jdbc-pool.xml | 4 +- modules/jdbc-pool/doc/package.xsl | 2 +- modules/jdbc-pool/doc/project.xml | 2 +- modules/jdbc-pool/pom.xml | 6 +- .../apache/tomcat/jdbc/pool/ConnectionPool.java | 37 +- .../org/apache/tomcat/jdbc/pool/DataSource.java | 4 +- .../apache/tomcat/jdbc/pool/DataSourceFactory.java | 11 +- .../apache/tomcat/jdbc/pool/DataSourceProxy.java | 44 +- .../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 1 + .../apache/tomcat/jdbc/pool/JdbcInterceptor.java | 16 +- .../jdbc/pool/MultiLockFairBlockingQueue.java | 1 + .../apache/tomcat/jdbc/pool/PoolConfiguration.java | 32 +- .../apache/tomcat/jdbc/pool/PoolProperties.java | 2 +- .../apache/tomcat/jdbc/pool/PooledConnection.java | 16 +- .../org/apache/tomcat/jdbc/pool/XADataSource.java | 2 +- .../AbstractCreateStatementInterceptor.java | 1 + .../jdbc/pool/interceptor/AbstractQueryReport.java | 2 +- .../jdbc/pool/interceptor/SlowQueryReport.java | 4 +- .../jdbc/pool/interceptor/SlowQueryReportJmx.java | 4 +- .../jdbc/pool/interceptor/StatementCache.java | 4 + .../interceptor/StatementDecoratorInterceptor.java | 5 +- .../jdbc/pool/interceptor/mbeans-descriptors.xml | 2 +- .../tomcat/jdbc/pool/jmx/ConnectionPool.java | 4 +- .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 2 +- .../jdbc/pool/interceptor/InduceSlowQuery.java | 2 +- .../jdbc/pool/interceptor/TestInterceptor.java | 2 +- .../apache/tomcat/jdbc/test/CreateTestTable.java | 2 +- .../test/TestJdbcInterceptorConfigParsing.java | 4 +- .../tomcat/jdbc/test/TestStatementCache.java | 1 - modules/tomcat-lite/.classpath | 25 - modules/tomcat-lite/.project | 17 - modules/tomcat-lite/build.xml | 319 - modules/tomcat-lite/ivy.xml | 32 - .../apache/coyote/lite/LiteProtocolHandler.java | 426 -- .../org/apache/tomcat/lite/http/BaseMapper.java | 1112 ---- .../apache/tomcat/lite/http/CompressFilter.java | 225 - .../org/apache/tomcat/lite/http/ContentType.java | 96 - .../tomcat/lite/http/DefaultHttpConnector.java | 23 - .../org/apache/tomcat/lite/http/Dispatcher.java | 199 - .../apache/tomcat/lite/http/Http11Connection.java | 1459 ----- .../org/apache/tomcat/lite/http/HttpChannel.java | 830 --- .../org/apache/tomcat/lite/http/HttpClient.java | 22 - .../tomcat/lite/http/HttpConnectionPool.java | 399 -- .../org/apache/tomcat/lite/http/HttpConnector.java | 514 -- .../org/apache/tomcat/lite/http/HttpMessage.java | 508 -- .../org/apache/tomcat/lite/http/HttpRequest.java | 1019 --- .../org/apache/tomcat/lite/http/HttpResponse.java | 581 -- .../org/apache/tomcat/lite/http/HttpServer.java | 35 - .../org/apache/tomcat/lite/http/HttpWriter.java | 313 - .../org/apache/tomcat/lite/http/MappingData.java | 69 - .../java/org/apache/tomcat/lite/http/MultiMap.java | 357 -- .../org/apache/tomcat/lite/http/ServerCookie.java | 819 --- .../apache/tomcat/lite/http/SpdyConnection.java | 820 --- .../java/org/apache/tomcat/lite/http/package.html | 0 .../java/org/apache/tomcat/lite/io/BBucket.java | 41 - .../java/org/apache/tomcat/lite/io/BBuffer.java | 1204 ---- .../apache/tomcat/lite/io/BufferedIOReader.java | 380 -- .../java/org/apache/tomcat/lite/io/CBucket.java | 508 -- .../java/org/apache/tomcat/lite/io/CBuffer.java | 387 -- .../org/apache/tomcat/lite/io/DumpChannel.java | 120 - .../apache/tomcat/lite/io/FastHttpDateFormat.java | 231 - .../org/apache/tomcat/lite/io/FileConnector.java | 27 - .../apache/tomcat/lite/io/FileConnectorJavaIo.java | 49 - .../org/apache/tomcat/lite/io/FutureCallbacks.java | 171 - .../java/org/apache/tomcat/lite/io/Hex.java | 249 - .../java/org/apache/tomcat/lite/io/IOBuffer.java | 698 -- .../java/org/apache/tomcat/lite/io/IOChannel.java | 371 -- .../org/apache/tomcat/lite/io/IOConnector.java | 66 - .../org/apache/tomcat/lite/io/IOInputStream.java | 71 - .../org/apache/tomcat/lite/io/IOOutputStream.java | 204 - .../java/org/apache/tomcat/lite/io/IOReader.java | 236 - .../java/org/apache/tomcat/lite/io/IOWriter.java | 212 - .../apache/tomcat/lite/io/MemoryIOConnector.java | 88 - .../java/org/apache/tomcat/lite/io/NioChannel.java | 198 - .../java/org/apache/tomcat/lite/io/NioThread.java | 1154 ---- .../org/apache/tomcat/lite/io/SocketConnector.java | 132 - .../org/apache/tomcat/lite/io/SocketIOChannel.java | 271 - .../org/apache/tomcat/lite/io/SslProvider.java | 24 - .../org/apache/tomcat/lite/io/UrlEncoding.java | 215 - .../apache/tomcat/lite/io/WrappedException.java | 40 - .../tomcat/lite/io/jsse/JsseSslProvider.java | 466 -- .../org/apache/tomcat/lite/io/jsse/SslChannel.java | 636 -- .../java/org/apache/tomcat/lite/io/package.html | 7 - .../org/apache/tomcat/lite/proxy/CopyCallback.java | 57 - .../apache/tomcat/lite/proxy/HttpProxyService.java | 368 -- .../tomcat/lite/proxy/ProxyFlushedCallback.java | 25 - .../org/apache/tomcat/lite/proxy/SocksServer.java | 448 -- .../tomcat/lite/proxy/StaticContentService.java | 129 - .../org/apache/tomcat/lite/service/IOStatus.java | 56 - .../org/apache/tomcat/lite/service/LogConfig.java | 65 - .../tomcat/lite/util/FastHttpDateFormat.java | 231 - .../org/apache/tomcat/lite/util/LocaleParser.java | 394 -- .../java/org/apache/tomcat/lite/util/MimeMap.java | 195 - .../java/org/apache/tomcat/lite/util/Range.java | 160 - .../org/apache/tomcat/lite/util/URLEncoder.java | 227 - .../java/org/apache/tomcat/lite/util/UrlUtils.java | 84 - modules/tomcat-lite/pom.xml | 118 - .../test/org/apache/coyote/lite/ServletTests.java | 98 - .../test/org/apache/coyote/lite/Tomcat.java | 911 --- .../apache/coyote/lite/TomcatLiteCoyoteTest.java | 42 - .../apache/coyote/lite/TomcatStandaloneMain.java | 59 - .../test/org/apache/tomcat/lite/TestMain.java | 313 - .../org/apache/tomcat/lite/http/ClientTest.java | 60 - .../tomcat/lite/http/CompressFilterTest.java | 82 - .../apache/tomcat/lite/http/DispatcherTest.java | 46 - .../tomcat/lite/http/HttpChannelInMemoryTest.java | 384 -- .../apache/tomcat/lite/http/HttpChannelTest.java | 128 - .../org/apache/tomcat/lite/http/HttpsTest.java | 74 - .../org/apache/tomcat/lite/http/LiveHttp1Test.java | 152 - .../org/apache/tomcat/lite/http/MultiMapTest.java | 54 - .../test/org/apache/tomcat/lite/http/SpdyTest.java | 165 - .../org/apache/tomcat/lite/http/genrsa_512.cert | 15 - .../org/apache/tomcat/lite/http/genrsa_512.der | Bin 345 -> 0 bytes .../tomcat/lite/http/services/EchoCallback.java | 61 - .../tomcat/lite/http/services/SleepCallback.java | 85 - .../test/org/apache/tomcat/lite/http/spdyreq0 | Bin 425 -> 0 bytes .../test/org/apache/tomcat/lite/http/spdyreq0.bin | Bin 425 -> 0 bytes .../org/apache/tomcat/lite/http/spdyreqCompressed | Bin 277 -> 0 bytes .../apache/tomcat/lite/http/spdyreqCompressed.bin | Bin 277 -> 0 bytes .../org/apache/tomcat/lite/io/BBufferTest.java | 159 - .../org/apache/tomcat/lite/io/CBufferTest.java | 32 - .../test/org/apache/tomcat/lite/io/OneTest.java | 27 - .../test/org/apache/tomcat/lite/io/SocksTest.java | 58 - .../org/apache/tomcat/lite/io/UEncoderTest.java | 44 - .../test/org/apache/tomcat/lite/io/test.properties | 33 - .../org/apache/tomcat/lite/load/LiveHttp5Test.java | 38 - .../tomcat/lite/load/LiveHttpThreadedTest.java | 292 - .../org/apache/tomcat/lite/load/MicroTest.java | 50 - .../org/apache/tomcat/lite/load/ThreadRunner.java | 64 - .../tomcat/lite/proxy/LiveProxyHttp1Test.java | 33 - .../org/apache/tomcat/lite/proxy/ProxyTest.java | 120 - .../apache/tomcat/lite/proxy/SmallProxyTest.java | 109 - .../org/apache/tomcat/lite/util/UEncoderTest.java | 51 - .../apache/tomcat/test/watchdog/AntProperties.java | 75 - .../tomcat/test/watchdog/CookieController.java | 636 -- .../apache/tomcat/test/watchdog/DynamicObject.java | 385 -- .../apache/tomcat/test/watchdog/HttpCookie.java | 290 - .../apache/tomcat/test/watchdog/RfcDateParser.java | 103 - .../tomcat/test/watchdog/WatchdogClient.java | 213 - .../tomcat/test/watchdog/WatchdogHttpClient.java | 411 -- .../tomcat/test/watchdog/WatchdogTestCase.java | 93 - .../tomcat/test/watchdog/WatchdogTestImpl.java | 1172 ---- res/INSTALLLICENSE | 4 + .../javax.servlet.ServletContainerInitializer | 15 + res/META-INF/jasper.jar/web-fragment.xml | 2 +- res/META-INF/jaspic-api.jar.manifest | 11 + .../javax.servlet.ServletContainerInitializer | 15 + .../services/javax.websocket.ContainerProvider | 15 + ...socket.server.ServerEndpointConfig$Configurator | 15 + res/META-INF/tomcat-websocket.jar/web-fragment.xml | 2 +- res/checkstyle/checkstyle.xml | 2 +- res/checkstyle/javax-checkstyle.xml | 2 +- res/checkstyle/javax-import-control.xml | 23 +- res/checkstyle/org-checkstyle.xml | 2 +- res/checkstyle/org-import-control.xml | 4 +- res/cobertura/logback.xml | 31 + res/deployer/build.xml | 2 +- res/findbugs/filter-false-positives.xml | 91 +- res/ide-support/eclipse/eclipse.project | 2 +- .../eclipse/java-compiler-errors-warnings.txt | 18 + .../eclipse/org.eclipse.jdt.core.prefs.properties | 6 +- res/ide-support/eclipse/start-tomcat.launch | 6 +- res/ide-support/eclipse/stop-tomcat.launch | 6 +- res/maven/mvn-pub.xml | 28 +- res/maven/mvn.properties.default | 2 +- res/maven/tomcat-embed-core.pom | 16 - res/maven/tomcat-embed-logging-juli.pom | 32 - res/maven/tomcat-embed-logging-log4j.pom | 32 - res/maven/tomcat-extras-juli-adapters.pom | 47 - res/maven/tomcat-extras-juli.pom | 32 - res/maven/tomcat-jaspic-api.pom | 32 + res/maven/tomcat-servlet-api.pom | 8 +- res/rat/rat-excludes.txt | 82 +- res/tomcat.nsi | 4 +- .../javax.servlet.ServletContainerInitializer | 15 + test/conf/jaspic-test-01.xml | 22 + test/conf/jaspic-test-02.xml | 26 + test/javax/el/TesterClass.java | 2 +- test/javax/servlet/http/TestCookie.java | 4 +- .../servlet/http/TestCookieNetscapeValidator.java | 43 - test/javax/servlet/http/TestHttpServlet.java | 2 +- .../catalina/authenticator/ResponseDescriptor.java | 59 + .../authenticator/TestDigestAuthenticator.java | 6 +- .../authenticator/TestFormAuthenticator.java | 15 +- .../TestNonLoginAndBasicAuthenticator.java | 70 +- .../TestSSOnonLoginAndBasicAuthenticator.java | 32 +- .../TestSSOnonLoginAndDigestAuthenticator.java | 27 +- .../TestPersistentProviderRegistrations.java | 87 + .../jaspic/TestSimpleServerAuthConfig.java | 74 + .../authenticator/jaspic/TesterMessageInfo.java | 55 + .../jaspic/TesterServerAuthModuleA.java | 64 + .../apache/catalina/comet/TestCometProcessor.java | 672 -- .../catalina/connector/TestCoyoteInputStream.java | 72 + .../catalina/connector/TestCoyoteOutputStream.java | 43 +- .../catalina/connector/TestMaxConnections.java | 3 + .../apache/catalina/connector/TestResponse.java | 5 +- .../connector/TestResponsePerformance.java | 4 + .../org/apache/catalina/connector/test_content.txt | 19 + .../catalina/core/TestApplicationContext.java | 82 + .../catalina/core/TestApplicationMapping.java | 312 + .../catalina/core/TestApplicationPushBuilder.java | 54 + .../apache/catalina/core/TestAsyncContextImpl.java | 9 +- .../apache/catalina/core/TestStandardContext.java | 1 - .../catalina/core/TestStandardContextAliases.java | 3 + .../core/TestStandardContextResources.java | 1 + .../apache/catalina/core/TestStandardWrapper.java | 5 +- .../catalina/core/TestSwallowAbortedUploads.java | 4 +- .../apache/catalina/filters/TestCorsFilter.java | 22 +- .../filters/TestRestCsrfPreventionFilter2.java | 72 +- .../catalina/filters/TesterHttpServletRequest.java | 47 +- .../catalina/loader/TestWebappClassLoader.java | 3 +- .../loader/TestWebappClassLoaderWeaving.java | 15 +- test/org/apache/catalina/mapper/TestMapper.java | 69 +- .../catalina/mapper/TestMapperPerformance.java | 26 +- .../apache/catalina/mbeans/TestRegistration.java | 11 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 50 +- .../catalina/servlets/TestDefaultServlet.java | 234 +- test/org/apache/catalina/session/Benchmarks.java | 23 +- .../apache/catalina/startup/SimpleHttpClient.java | 32 +- .../apache/catalina/startup/TestContextConfig.java | 4 +- .../startup/TestContextConfigAnnotation.java | 42 +- .../catalina/startup/TestTomcatClassLoader.java | 4 +- .../apache/catalina/startup/TomcatBaseTest.java | 35 +- .../catalina/startup/web-1lifecyclecallback.xml | 2 +- test/org/apache/catalina/startup/web-1ordering.xml | 2 +- .../catalina/startup/web-2lifecyclecallback.xml | 2 +- test/org/apache/catalina/startup/web-2ordering.xml | 2 +- .../apache/catalina/startup/web-fragment-1name.xml | 2 +- .../catalina/startup/web-fragment-1ordering.xml | 2 +- .../apache/catalina/startup/web-fragment-2name.xml | 2 +- .../catalina/startup/web-fragment-2ordering.xml | 2 +- .../apache/catalina/tribes/demos/EchoRpcTest.java | 4 - .../catalina/tribes/demos/IntrospectionUtils.java | 6 +- .../org/apache/catalina/tribes/demos/LoadTest.java | 4 +- test/org/apache/catalina/tribes/demos/MapDemo.java | 2 +- .../apache/catalina/tribes/test/NioSenderTest.java | 7 +- .../tribes/test/channel/TestDataIntegrity.java | 2 +- .../tribes/test/channel/TestMulticastPackages.java | 2 +- .../test/channel/TestRemoteProcessException.java | 2 +- .../tribes/test/channel/TestUdpPackages.java | 2 +- .../tribes/test/transport/SocketNioReceive.java | 2 +- .../tribes/test/transport/SocketNioSend.java | 8 +- .../test/transport/SocketNioValidateSend.java | 8 +- test/org/apache/catalina/util/TestConversions.java | 37 - test/org/apache/catalina/valves/Benchmarks.java | 2 +- .../webresources/war/TestHandlerIntegration.java | 1 + test/org/apache/coyote/TestIoTimeouts.java | 241 + test/org/apache/coyote/ajp/SimpleAjpClient.java | 5 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 28 +- .../coyote/http11/TestAbstractHttp11Processor.java | 948 --- .../apache/coyote/http11/TestGzipOutputFilter.java | 91 - .../coyote/http11/TestHttp11InputBuffer.java | 604 ++ .../coyote/http11/TestHttp11OutputBuffer.java | 89 + .../apache/coyote/http11/TestHttp11Processor.java | 975 +++ .../coyote/http11/TestInternalInputBuffer.java | 603 -- .../http11/filters/TestChunkedInputFilter.java | 4 +- .../http11/filters/TestGzipOutputFilter.java | 87 + .../coyote/http11/filters/TesterOutputBuffer.java | 126 + .../apache/coyote/http11/upgrade/TestUpgrade.java | 77 +- .../http11/upgrade/TestUpgradeInternalHandler.java | 267 + test/org/apache/coyote/http2/Http2TestBase.java | 1178 ++++ .../apache/coyote/http2/TestAbstractStream.java | 249 + test/org/apache/coyote/http2/TestByteUtil.java | 39 + test/org/apache/coyote/http2/TestHpack.java | 90 + test/org/apache/coyote/http2/TestHttp2Limits.java | 474 ++ .../apache/coyote/http2/TestHttp2Section_3_2.java | 180 + .../apache/coyote/http2/TestHttp2Section_3_5.java | 39 + .../apache/coyote/http2/TestHttp2Section_4_1.java | 72 + .../apache/coyote/http2/TestHttp2Section_4_2.java | 143 + .../apache/coyote/http2/TestHttp2Section_4_3.java | 100 + .../apache/coyote/http2/TestHttp2Section_5_1.java | 309 + .../apache/coyote/http2/TestHttp2Section_5_2.java | 116 + .../apache/coyote/http2/TestHttp2Section_5_3.java | 249 + .../apache/coyote/http2/TestHttp2Section_5_5.java | 101 + .../apache/coyote/http2/TestHttp2Section_6_1.java | 168 + .../apache/coyote/http2/TestHttp2Section_6_2.java | 118 + .../apache/coyote/http2/TestHttp2Section_6_3.java | 94 + .../apache/coyote/http2/TestHttp2Section_6_4.java | 87 + .../apache/coyote/http2/TestHttp2Section_6_5.java | 151 + .../apache/coyote/http2/TestHttp2Section_6_7.java | 92 + .../apache/coyote/http2/TestHttp2Section_6_8.java | 104 + .../apache/coyote/http2/TestHttp2Section_6_9.java | 290 + .../apache/coyote/http2/TestHttp2Section_8_1.java | 215 + test/org/apache/el/TestELInJsp.java | 4 +- .../apache/el/parser/TestAstLambdaExpression.java | 10 + test/org/apache/el/parser/TestELParser.java | 61 + test/org/apache/jasper/compiler/TestCompiler.java | 5 +- test/org/apache/jasper/compiler/TestJspConfig.java | 16 +- .../jasper/servlet/TestJspCServletContext.java | 1 + .../apache/naming/resources/TestWarDirContext.java | 1 + test/org/apache/tomcat/unittest/TesterContext.java | 17 - .../tomcat/unittest/TesterLeakingServlet1.java | 7 - .../apache/tomcat/util/buf/TestB2CConverter.java | 12 +- test/org/apache/tomcat/util/buf/TestUEncoder.java | 29 - test/org/apache/tomcat/util/buf/TestUtf8.java | 112 +- .../collections/TestCaseInsensitiveKeyMap.java | 215 + .../apache/tomcat/util/http/CookiesBaseTest.java | 3 +- .../util/http/TestCookiesDefaultSysProps.java | 2 +- .../http/TestCookiesNoStrictNamingSysProps.java | 2 +- .../util/http/TestMimeHeadersIntegration.java | 7 +- .../util/http/TesterHttpMessagesPerformance.java | 44 - test/org/apache/tomcat/util/net/TestCustomSsl.java | 3 + .../apache/tomcat/util/net/TestSSLHostConfig.java | 68 + .../util/net/TestSSLHostConfigIntegration.java | 62 + test/org/apache/tomcat/util/net/TestSsl.java | 4 +- .../apache/tomcat/util/net/TestXxxEndpoint.java | 4 - test/org/apache/tomcat/util/net/TesterSupport.java | 33 +- .../util/net/jsse/TesterBug50640SslImpl.java | 24 +- .../tomcat/util/net/jsse/openssl/TestCipher.java | 1067 ---- .../TestOpenSSLCipherConfigurationParser.java | 594 -- .../TestOpenSSLCipherConfigurationParserOnly.java | 113 - .../util/net/jsse/openssl/TesterOpenSSL.java | 439 -- .../util/net/openssl/ciphers/TestCipher.java | 1067 ++++ .../TestOpenSSLCipherConfigurationParser.java | 594 ++ .../TestOpenSSLCipherConfigurationParserOnly.java | 113 + .../util/net/openssl/ciphers/TesterOpenSSL.java | 439 ++ .../tomcat/util/scan/TestStandardJarScanner.java | 13 +- .../apache/tomcat/util/threads/TestLimitLatch.java | 2 + .../tomcat/websocket/TestConnectionLimit.java | 109 + .../websocket/TestWebSocketFrameClientSSL.java | 13 +- .../tomcat/websocket/TestWsPingPongMessages.java | 2 - .../tomcat/websocket/TestWsRemoteEndpoint.java | 103 +- .../tomcat/websocket/TestWsSubprotocols.java | 23 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 16 +- .../tomcat/websocket/TesterConnectionLimit.java | 108 - .../apache/tomcat/websocket/TesterEchoServer.java | 23 + .../tomcat/websocket/TesterFirehoseServer.java | 24 +- .../websocket/pojo/TestEncodingDecoding.java | 165 +- .../apache/tomcat/websocket/pojo/TesterUtil.java | 21 +- .../tomcat/websocket/server/TestClassLoader.java | 151 + .../apache/tomcat/websocket/server/TestClose.java | 45 +- .../tomcat/websocket/server/TestShutdown.java | 111 + .../server/TestWsRemoteEndpointImplServer.java | 26 +- .../websocket/server/TestWsServerContainer.java | 21 +- .../websocket/server/TesterEndpointConfig.java | 54 + .../websocket/server/TesterWsCloseClient.java | 7 +- test/webapp-2.2/WEB-INF/web.xml | 2 +- test/webapp-2.3/WEB-INF/web.xml | 2 +- test/webapp-2.4/WEB-INF/web.xml | 2 +- test/webapp-2.5/WEB-INF/web.xml | 2 +- test/webapp-3.0/WEB-INF/web.xml | 2 +- test/webapp-3.1/WEB-INF/web.xml | 2 +- .../WEB-INF/web.xml | 2 +- test/webapp-fragments/WEB-INF/web.xml | 2 +- test/webapp-servletsecurity/WEB-INF/web.xml | 2 +- test/webapp-servletsecurity2/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- test/webapp/WEB-INF/bug53545.tld | 2 +- .../META-INF/org.apache.jasper/tagPlugins.xml | 2 +- .../classes/org/apache/tomcat/Bug58096.class | Bin 285 -> 208 bytes .../classes/org/apache/tomcat/Bug58096.java | 2 +- test/webapp/WEB-INF/tags/bug48668.tagx | 2 +- test/webapp/WEB-INF/tags/bug55198.tagx | 2 +- test/webapp/WEB-INF/tags/bug56265.tagx | 2 +- test/webapp/WEB-INF/web.xml | 2 +- test/webapp/bug5nnnn/bug54801a.jspx | 2 +- test/webapp/bug5nnnn/bug54801b.jspx | 2 +- test/webapp/bug5nnnn/bug54821a.jspx | 2 +- test/webapp/bug5nnnn/bug54821b.jspx | 2 +- test/webapp/bug5nnnn/bug56029.jspx | 2 +- test/webapp/bug5nnnn/bug56334and56561.jspx | 2 +- test/webapp/index.html | 16 + test/webapp/index.html.br | Bin 0 -> 367 bytes test/webapp/index.html.gz | Bin 135 -> 562 bytes webapps/ROOT/WEB-INF/web.xml | 2 +- webapps/docs/aio.xml | 279 +- webapps/docs/appdev/web.xml.txt | 2 +- webapps/docs/apr.xml | 21 +- webapps/docs/building.xml | 2 +- webapps/docs/changelog.xml | 6656 +++----------------- webapps/docs/class-loader-howto.xml | 18 +- webapps/docs/cluster-howto.xml | 10 +- webapps/docs/config/ajp.xml | 44 +- webapps/docs/config/cluster-interceptor.xml | 34 +- webapps/docs/config/cluster-manager.xml | 20 - webapps/docs/config/context.xml | 15 +- webapps/docs/config/cookie-processor.xml | 101 +- webapps/docs/config/filter.xml | 2 +- webapps/docs/config/host.xml | 9 +- webapps/docs/config/http.xml | 958 +-- webapps/docs/config/http2.xml | 187 + webapps/docs/config/jaspic.xml | 186 + webapps/docs/config/listeners.xml | 26 +- webapps/docs/config/loader.xml | 12 +- webapps/docs/config/manager.xml | 39 - webapps/docs/config/project.xml | 4 +- webapps/docs/config/realm.xml | 53 +- webapps/docs/config/systemprops.xml | 151 +- webapps/docs/config/valve.xml | 22 +- webapps/docs/default-servlet.xml | 24 +- webapps/docs/funcspecs/fs-admin-objects.xml | 3 - webapps/docs/funcspecs/mbean-names.xml | 9 - webapps/docs/jasper-howto.xml | 4 +- webapps/docs/jndi-resources-howto.xml | 4 +- webapps/docs/logging.xml | 219 +- webapps/docs/manager-howto.xml | 2 +- webapps/docs/realm-howto.xml | 18 +- webapps/docs/security-howto.xml | 45 +- webapps/docs/ssl-howto.xml | 62 +- webapps/docs/tomcat-docs.xsl | 6 +- webapps/docs/web-socket-howto.xml | 36 - webapps/examples/WEB-INF/classes/async/Async0.java | 6 +- webapps/examples/WEB-INF/classes/async/Async2.java | 10 +- .../WEB-INF/classes/async/AsyncStockServlet.java | 7 +- .../examples/WEB-INF/classes/chat/ChatServlet.java | 292 - .../compressionFilters/CompressionFilter.java | 105 +- .../CompressionResponseStream.java | 17 +- .../CompressionServletResponseWrapper.java | 24 +- .../WEB-INF/classes/filters/ExampleFilter.java | 7 +- .../WEB-INF/classes/http2/SimpleImagePush.java | 52 + .../examples/WEB-INF/classes/util/HTMLFilter.java | 2 + .../classes/websocket/drawboard/Client.java | 3 +- .../classes/websocket/drawboard/DrawMessage.java | 36 +- .../WEB-INF/classes/websocket/drawboard/Room.java | 16 +- .../examples/WEB-INF/jsp2/jsp2-example-taglib.tld | 2 +- webapps/examples/WEB-INF/web.xml | 20 +- webapps/examples/jsp/async/async1.jsp | 8 +- webapps/examples/jsp/async/async3.jsp | 9 +- webapps/examples/jsp/xml/xml.jsp | 2 +- webapps/examples/servlets/chat/index.jsp | 32 - webapps/examples/servlets/chat/login.jsp | 33 - webapps/examples/servlets/chat/post.jsp | 55 - webapps/examples/servlets/index.html | 25 +- webapps/examples/websocket/drawboard.xhtml | 44 +- webapps/host-manager/META-INF/context.xml | 6 - webapps/host-manager/WEB-INF/jsp/403.jsp | 5 + webapps/host-manager/WEB-INF/web.xml | 2 +- webapps/manager/META-INF/context.xml | 6 - webapps/manager/WEB-INF/jsp/403.jsp | 5 + webapps/manager/WEB-INF/jsp/connectorCiphers.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +- webapps/manager/WEB-INF/web.xml | 2 +- webapps/manager/xform.xsl | 2 +- 1381 files changed, 61629 insertions(+), 88126 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits