[tomcat8] branch master updated (3ff6f76 -> abb0119)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 8 23:57:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat8.
from 3ff6f76 Upload to unstable
adds a9ddd3c Imported Upstream version 8.0.15
new d7a20cf Merge tag 'upstream/8.0.15'
new b961232 Refreshed the patches
new abb0119 Upload to experimental
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
BUILDING.txt | 2 +-
RELEASE-NOTES | 4 +-
build.properties.default | 6 +-
build.xml | 131 +++--
conf/tomcat-users.xml | 5 +-
conf/tomcat-users.xsd | 43 ++
debian/changelog | 7 +
...-deploy-webapps-target-from-deploy-target.patch | 2 +-
debian/patches/0005-skip-test-failures.patch | 4 +-
debian/patches/0010-debianize-build-xml.patch | 4 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
.../0019-add-distribution-to-error-page.patch | 4 +-
java/javax/el/BeanNameResolver.java | 36 +-
java/javax/el/ELContext.java | 74 +++
java/javax/el/ELContextEvent.java | 5 +-
java/javax/el/ELProcessor.java | 6 +
java/javax/el/ELResolver.java | 45 +-
java/javax/el/EvaluationListener.java | 15 +-
java/javax/el/ExpressionFactory.java | 31 ++
java/javax/el/FunctionMapper.java | 8 +-
java/javax/el/ImportHandler.java | 52 +-
java/javax/el/MethodExpression.java | 12 +
java/javax/el/ValueExpression.java | 21 +
java/javax/servlet/AsyncContext.java | 41 +-
java/javax/servlet/Filter.java | 30 +-
java/javax/servlet/FilterChain.java | 4 +
java/javax/servlet/FilterConfig.java | 6 +-
java/javax/servlet/FilterRegistration.java | 34 +-
java/javax/servlet/HttpConstraintElement.java | 39 +-
java/javax/servlet/ReadListener.java | 4 +-
java/javax/servlet/Registration.java | 54 +-
java/javax/servlet/ServletContext.java | 208 +++++---
.../servlet/ServletContextAttributeEvent.java | 15 +-
.../servlet/ServletContextAttributeListener.java | 9 +-
java/javax/servlet/ServletContextListener.java | 2 +
java/javax/servlet/ServletInputStream.java | 16 +-
java/javax/servlet/ServletRegistration.java | 4 +-
java/javax/servlet/ServletRequest.java | 15 +-
.../servlet/ServletRequestAttributeListener.java | 43 +-
java/javax/servlet/ServletRequestEvent.java | 6 +-
java/javax/servlet/ServletRequestListener.java | 36 +-
java/javax/servlet/ServletRequestWrapper.java | 43 +-
java/javax/servlet/ServletResponse.java | 16 +-
java/javax/servlet/ServletResponseWrapper.java | 23 +-
java/javax/servlet/ServletSecurityElement.java | 10 +-
java/javax/servlet/SessionCookieConfig.java | 48 +-
java/javax/servlet/WriteListener.java | 4 +-
java/javax/servlet/annotation/HttpConstraint.java | 2 +-
.../servlet/annotation/HttpMethodConstraint.java | 2 +-
java/javax/servlet/annotation/MultipartConfig.java | 12 +-
java/javax/servlet/annotation/ServletSecurity.java | 6 +-
java/javax/servlet/annotation/WebFilter.java | 24 +-
java/javax/servlet/annotation/WebInitParam.java | 6 +-
java/javax/servlet/annotation/WebListener.java | 10 +-
java/javax/servlet/annotation/WebServlet.java | 26 +-
java/javax/servlet/http/HttpServletRequest.java | 16 +-
.../servlet/http/HttpServletRequestWrapper.java | 2 +
java/javax/servlet/http/HttpServletResponse.java | 16 +-
.../servlet/http/HttpServletResponseWrapper.java | 2 +
java/javax/servlet/http/HttpSession.java | 2 +
.../http/HttpSessionActivationListener.java | 31 +-
.../servlet/http/HttpSessionAttributeListener.java | 6 +
.../servlet/http/HttpSessionBindingEvent.java | 26 +-
java/javax/servlet/http/HttpSessionContext.java | 6 +
java/javax/servlet/http/HttpSessionEvent.java | 12 +-
java/javax/servlet/http/Part.java | 31 +-
java/javax/servlet/http/WebConnection.java | 8 +
java/javax/servlet/jsp/JspApplicationContext.java | 11 +-
java/javax/servlet/jsp/JspContext.java | 2 +-
java/javax/servlet/jsp/el/ExpressionEvaluator.java | 2 +-
.../servlet/jsp/el/ScopedAttributeELResolver.java | 33 +-
java/javax/servlet/jsp/tagext/BodyTag.java | 2 +-
java/javax/servlet/jsp/tagext/IterationTag.java | 2 +-
java/javax/servlet/jsp/tagext/Tag.java | 6 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 31 +-
java/javax/servlet/jsp/tagext/TagData.java | 4 +-
java/javax/servlet/jsp/tagext/VariableInfo.java | 69 +--
java/javax/websocket/ContainerProvider.java | 2 +
java/javax/websocket/Endpoint.java | 6 +-
java/javax/websocket/PongMessage.java | 4 +-
java/javax/websocket/RemoteEndpoint.java | 80 ++-
java/javax/websocket/Session.java | 60 ++-
java/javax/websocket/WebSocketContainer.java | 41 +-
java/javax/websocket/server/HandshakeRequest.java | 2 +
java/javax/websocket/server/ServerEndpoint.java | 2 +
.../websocket/server/ServerEndpointConfig.java | 1 +
java/org/apache/catalina/AsyncDispatcher.java | 5 +
java/org/apache/catalina/Authenticator.java | 9 +-
java/org/apache/catalina/Cluster.java | 2 +
java/org/apache/catalina/Contained.java | 19 +-
java/org/apache/catalina/Container.java | 60 ++-
java/org/apache/catalina/Context.java | 40 +-
java/org/apache/catalina/CredentialHandler.java | 46 ++
java/org/apache/catalina/Globals.java | 3 -
java/org/apache/catalina/Lifecycle.java | 24 +-
java/org/apache/catalina/Realm.java | 11 +
java/org/apache/catalina/WebResource.java | 7 +
java/org/apache/catalina/WebResourceRoot.java | 13 +-
.../catalina/ant/BaseRedirectorHelperTask.java | 1 +
java/org/apache/catalina/ant/JMXQueryTask.java | 3 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 18 +-
.../catalina/ant/jmx/JMXAccessorCreateTask.java | 4 +-
.../ant/jmx/JMXAccessorEqualsCondition.java | 12 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 4 +-
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 4 +-
.../catalina/ant/jmx/JMXAccessorSetTask.java | 2 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +-
.../ant/jmx/JMXAccessorUnregisterTask.java | 4 +-
.../catalina/authenticator/AuthenticatorBase.java | 35 +-
.../authenticator/DigestAuthenticator.java | 2 +-
.../authenticator/NonLoginAuthenticator.java | 4 +-
.../catalina/authenticator/SingleSignOn.java | 4 +-
.../authenticator/SpnegoAuthenticator.java | 32 +-
java/org/apache/catalina/comet/CometEvent.java | 4 +-
java/org/apache/catalina/connector/Connector.java | 2 +-
.../apache/catalina/connector/CoyoteAdapter.java | 15 +-
.../catalina/connector/LocalStrings.properties | 2 +
.../apache/catalina/connector/OutputBuffer.java | 13 +-
java/org/apache/catalina/connector/Request.java | 84 ++-
java/org/apache/catalina/connector/Response.java | 21 +-
java/org/apache/catalina/core/ApplicationPart.java | 6 +-
.../apache/catalina/core/AprLifecycleListener.java | 35 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 7 +-
java/org/apache/catalina/core/ContainerBase.java | 1 +
java/org/apache/catalina/core/StandardContext.java | 43 +-
java/org/apache/catalina/core/StandardEngine.java | 2 +-
.../apache/catalina/core/mbeans-descriptors.xml | 9 -
.../catalina/filters/AddDefaultCharsetFilter.java | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 2 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 53 +-
.../apache/catalina/filters/RemoteIpFilter.java | 51 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 8 +-
java/org/apache/catalina/ha/deploy/WarWatcher.java | 8 +-
.../catalina/ha/session/ClusterManagerBase.java | 11 +
.../apache/catalina/ha/session/DeltaManager.java | 4 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 8 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 2 +-
.../catalina/loader/WebappClassLoaderBase.java | 41 +-
java/org/apache/catalina/loader/WebappLoader.java | 26 +-
java/org/apache/catalina/manager/JspHelper.java | 10 +-
.../apache/catalina/manager/ManagerServlet.java | 6 +-
.../catalina/manager/host/HostManagerServlet.java | 2 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 2 +-
.../realm/DigestCredentialHandlerBase.java | 235 ++++++++
.../apache/catalina/realm/GenericPrincipal.java | 4 +-
java/org/apache/catalina/realm/JDBCRealm.java | 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 25 +-
.../apache/catalina/realm/LocalStrings.properties | 4 +
java/org/apache/catalina/realm/MemoryRealm.java | 2 +-
.../realm/MessageDigestCredentialHandler.java | 185 +++++++
.../catalina/realm/NestedCredentialHandler.java | 60 +++
java/org/apache/catalina/realm/RealmBase.java | 308 +++++++++--
.../catalina/realm/SecretKeyCredentialHandler.java | 100 ++++
.../org/apache/catalina/security/SecurityUtil.java | 10 +-
java/org/apache/catalina/servlets/CGIServlet.java | 10 +-
.../apache/catalina/servlets/DefaultServlet.java | 6 +-
.../apache/catalina/servlets/WebdavServlet.java | 4 +-
java/org/apache/catalina/session/ManagerBase.java | 21 +-
.../apache/catalina/session/PersistentManager.java | 2 +
.../catalina/session/PersistentManagerBase.java | 2 +-
java/org/apache/catalina/startup/Catalina.java | 16 +-
.../apache/catalina/startup/ContextRuleSet.java | 7 +
...mRuleSet.java => CredentialHandlerRuleSet.java} | 33 +-
.../org/apache/catalina/startup/FailedContext.java | 16 +-
.../apache/catalina/startup/HomesUserDatabase.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 2 -
.../catalina/startup/LocalStrings.properties | 21 +-
.../catalina/startup/PasswdUserDatabase.java | 2 +-
java/org/apache/catalina/startup/RealmRuleSet.java | 1 +
java/org/apache/catalina/startup/Tomcat.java | 5 +-
java/org/apache/catalina/startup/Tool.java | 2 +-
.../catalina/startup/VersionLoggerListener.java | 68 ++-
.../catalina/startup/WebappServiceLoader.java | 6 +-
.../{SenderSF.java => JarScannerSF.java} | 32 +-
.../org/apache/catalina/storeconfig/ManagerSF.java | 20 +-
.../catalina/storeconfig/PersistentManagerSF.java | 9 +-
.../catalina/storeconfig/StandardContextSF.java | 10 +
.../apache/catalina/storeconfig/StoreAppender.java | 4 +-
.../catalina/storeconfig/StoreFileMover.java | 2 +-
.../catalina/storeconfig/server-registry.xml | 31 ++
java/org/apache/catalina/tribes/Channel.java | 2 +-
.../apache/catalina/tribes/ChannelInterceptor.java | 8 +-
.../catalina/tribes/group/AbsoluteOrder.java | 7 +-
.../apache/catalina/tribes/group/GroupChannel.java | 8 +-
.../interceptors/FragmentationInterceptor.java | 4 +-
.../group/interceptors/OrderInterceptor.java | 6 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 6 +-
.../catalina/tribes/membership/McastService.java | 2 +-
.../catalina/tribes/membership/Membership.java | 2 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 6 +-
.../tribes/transport/bio/util/FastQueue.java | 2 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 22 +-
.../catalina/tribes/transport/nio/NioSender.java | 10 +-
.../tribes}/util/ExceptionUtils.java | 20 +-
java/org/apache/catalina/users/MemoryUser.java | 2 +-
.../apache/catalina/users/MemoryUserDatabase.java | 5 +-
.../apache/catalina/util/ExtensionValidator.java | 2 +-
.../apache/catalina/util/LifecycleMBeanBase.java | 4 +-
java/org/apache/catalina/util/MIME2Java.java | 1 +
java/org/apache/catalina/util/RequestUtil.java | 4 +-
.../catalina/util/SessionIdGeneratorBase.java | 33 +-
.../apache/catalina/valves/ErrorReportValve.java | 3 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 2 +-
java/org/apache/catalina/valves/RemoteIpValve.java | 49 +-
.../catalina/valves/rewrite/RewriteCond.java | 4 +-
.../catalina/valves/rewrite/RewriteValve.java | 6 +-
.../webresources/AbstractArchiveResource.java | 22 +-
.../catalina/webresources/CachedResource.java | 5 +
.../catalina/webresources/EmptyResource.java | 5 +
.../catalina/webresources/EmptyResourceSet.java | 163 ++++++
.../apache/catalina/webresources/FileResource.java | 5 +
.../apache/catalina/webresources/JarResource.java | 2 +-
.../catalina/webresources/JarResourceRoot.java | 17 +-
.../catalina/webresources/JarResourceSet.java | 3 +
.../catalina/webresources/JarWarResource.java | 2 +-
.../catalina/webresources/JarWarResourceSet.java | 3 +
.../apache/catalina/webresources/StandardRoot.java | 29 +-
.../TomcatURLStreamHandlerFactory.java | 7 +
.../catalina/webresources/mbeans-descriptors.xml | 6 +
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/ActionCode.java | 33 +-
java/org/apache/coyote/AsyncStateMachine.java | 80 +--
java/org/apache/coyote/Request.java | 17 +-
java/org/apache/coyote/Response.java | 17 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 4 +
java/org/apache/coyote/ajp/AjpMessage.java | 90 +---
.../coyote/http11/AbstractHttp11Processor.java | 45 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 2 +-
.../coyote/http11/AbstractNioInputBuffer.java | 18 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 55 +-
.../apache/coyote/http11/InternalInputBuffer.java | 2 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 4 +-
.../coyote/http11/filters/IdentityInputFilter.java | 4 +-
java/org/apache/coyote/spdy/SpdyAprNpnHandler.java | 4 +-
java/org/apache/coyote/spdy/SpdyProxyProtocol.java | 4 +-
java/org/apache/el/MethodExpressionImpl.java | 12 +-
java/org/apache/el/ValueExpressionImpl.java | 5 +-
java/org/apache/el/lang/ELSupport.java | 42 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 3 -
java/org/apache/el/parser/ArithmeticNode.java | 5 -
.../org/apache/el/parser/AstLiteralExpression.java | 5 +-
java/org/apache/el/parser/BooleanNode.java | 6 +-
java/org/apache/el/parser/Node.java | 1 +
java/org/apache/el/parser/ParseException.java | 1 +
java/org/apache/el/util/ReflectionUtil.java | 18 +-
java/org/apache/el/util/Validation.java | 9 +-
java/org/apache/jasper/compiler/AntCompiler.java | 4 +-
java/org/apache/jasper/compiler/ELParser.java | 69 ++-
.../apache/jasper/compiler/JspDocumentParser.java | 6 +-
java/org/apache/jasper/compiler/JspReader.java | 281 +++-------
.../apache/jasper/compiler/JspRuntimeContext.java | 2 +-
java/org/apache/jasper/compiler/JspUtil.java | 6 +-
java/org/apache/jasper/compiler/Mark.java | 129 +----
java/org/apache/jasper/compiler/Node.java | 21 +-
java/org/apache/jasper/compiler/Parser.java | 125 ++---
.../apache/jasper/compiler/ParserController.java | 3 +-
.../compiler/tagplugin/TagPluginContext.java | 2 +-
.../jasper/resources/LocalStrings.properties | 3 +-
java/org/apache/jasper/runtime/JspWriterImpl.java | 2 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 3 +-
java/org/apache/jasper/servlet/JspServlet.java | 2 +-
java/org/apache/jasper/servlet/TldScanner.java | 31 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 10 +-
java/org/apache/jasper/xmlparser/EncodingMap.java | 2 +-
java/org/apache/juli/ClassLoaderLogManager.java | 28 +-
.../apache/juli/WebappProperties.java} | 40 +-
java/org/apache/juli/logging/Log.java | 8 +-
java/org/apache/juli/logging/LogFactory.java | 4 +-
java/org/apache/naming/JndiPermission.java | 2 +-
java/org/apache/naming/SelectorContext.java | 96 ++--
java/org/apache/naming/factory/BeanFactory.java | 2 +-
.../org/apache/naming/factory/SendMailFactory.java | 48 +-
java/org/apache/tomcat/buildutil/SignCode.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 61 ++-
.../dbcp/dbcp2/datasources/package-info.java | 20 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 16 +-
java/org/apache/tomcat/jni/Buffer.java | 4 +-
java/org/apache/tomcat/jni/File.java | 22 +-
java/org/apache/tomcat/jni/Global.java | 2 +-
java/org/apache/tomcat/jni/Lock.java | 4 +-
java/org/apache/tomcat/jni/Multicast.java | 2 +-
java/org/apache/tomcat/jni/Poll.java | 12 +-
java/org/apache/tomcat/jni/Pool.java | 2 +-
java/org/apache/tomcat/jni/Procattr.java | 10 +-
java/org/apache/tomcat/jni/SSL.java | 24 +-
java/org/apache/tomcat/jni/SSLContext.java | 48 +-
java/org/apache/tomcat/jni/SSLSocket.java | 6 +-
java/org/apache/tomcat/jni/Shm.java | 10 +-
java/org/apache/tomcat/jni/Socket.java | 8 +-
java/org/apache/tomcat/jni/Status.java | 2 +-
java/org/apache/tomcat/jni/Stdlib.java | 4 +-
java/org/apache/tomcat/jni/Time.java | 2 +-
.../apache/tomcat/jni/socket/AprSocketContext.java | 6 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 7 +-
java/org/apache/tomcat/util/buf/HexUtils.java | 17 +-
.../apache/tomcat/util/buf/LocalStrings.properties | 3 +
java/org/apache/tomcat/util/buf/MessageBytes.java | 26 +-
.../tomcat/util/descriptor/tld/TaglibXml.java | 2 +-
.../util/descriptor/tld/TldResourcePath.java | 2 +-
.../util/descriptor/web/JspPropertyGroup.java | 6 +-
.../web/JspPropertyGroupDescriptorImpl.java | 24 +-
.../apache/tomcat/util/digester/CallParamRule.java | 10 +-
java/org/apache/tomcat/util/digester/Digester.java | 4 +-
.../Constants.java => http/CookieProcessor.java} | 23 +-
.../org/apache/tomcat/util/http/CookieSupport.java | 7 +-
.../{Cookies.java => LegacyCookieProcessor.java} | 590 ++++++++++++++++-----
.../tomcat/util/http/LocalStrings.properties | 4 +
.../tomcat/util/http/Rfc6265CookieProcessor.java | 209 ++++++++
java/org/apache/tomcat/util/http/ServerCookie.java | 2 +-
.../apache/tomcat/util/http/SetCookieSupport.java | 233 +-------
.../util/http/fileupload/MultipartStream.java | 2 +-
.../org/apache/tomcat/util/http/parser/Cookie.java | 2 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 6 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 10 -
.../apache/tomcat/util/net/SecureNio2Channel.java | 2 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 2 +-
.../apache/tomcat/util/net/SocketProperties.java | 2 +-
java/org/apache/tomcat/util/net/URL.java | 4 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 126 +++--
.../util/net/jsse/res/LocalStrings.properties | 3 +
.../tomcat/util/scan/StandardJarScanner.java | 33 +-
.../util/security/ConcurrentMessageDigest.java | 18 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 23 +-
java/org/apache/tomcat/websocket/Constants.java | 2 +
.../tomcat/websocket/LocalStrings.properties | 5 +
.../apache/tomcat/websocket/PerMessageDeflate.java | 36 +-
.../apache/tomcat/websocket/Transformation.java | 9 +
.../tomcat/websocket/TransformationFactory.java | 5 +-
java/org/apache/tomcat/websocket/Util.java | 30 +-
.../org/apache/tomcat/websocket/WsFrameClient.java | 14 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 44 +-
java/org/apache/tomcat/websocket/WsSession.java | 35 +-
.../tomcat/websocket/WsWebSocketContainer.java | 55 +-
.../websocket/server/LocalStrings.properties | 2 +
.../tomcat/websocket/server/UpgradeUtil.java | 21 +-
.../tomcat/websocket/server/WsFrameServer.java | 3 +
.../tomcat/websocket/server/WsServerContainer.java | 6 +-
.../java/org/apache/cometd/bayeux/Bayeux.java | 28 +-
.../java/org/apache/cometd/bayeux/DataFilter.java | 4 +-
.../java/org/apache/cometd/bayeux/Listener.java | 2 +-
.../java/org/apache/cometd/bayeux/Message.java | 2 +-
.../org/apache/tomcat/bayeux/BayeuxRequest.java | 2 +-
modules/jdbc-pool/build.properties.default | 2 +-
modules/jdbc-pool/build.xml | 22 +-
modules/jdbc-pool/doc/package.xsl | 217 +-------
modules/jdbc-pool/pom.xml | 15 +-
modules/jdbc-pool/resources/MANIFEST.MF | 2 -
.../org/apache/tomcat/jdbc/pool/DataSource.java | 8 +-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 7 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 2 +-
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 2 +-
.../apache/tomcat/jdbc/pool/JdbcInterceptor.java | 4 +-
.../jdbc/pool/MultiLockFairBlockingQueue.java | 2 +-
.../apache/tomcat/jdbc/pool/PoolConfiguration.java | 16 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 2 +-
.../test/org/apache/tomcat/lite/TestMain.java | 6 +-
res/checkstyle/org-import-control.xml | 1 +
res/confinstall/tomcat-users_1.xml | 5 +-
res/findbugs/filter-false-positives.xml | 6 +
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 196 ++++---
test/javax/el/TestCompositeELResolver.java | 22 +-
test/javax/el/TestELProcessor.java | 17 +
test/javax/el/TestImportHandler.java | 102 +++-
test/javax/el/TestUtil.java | 9 +-
test/javax/el/TesterBean.java | 13 +
test/javax/servlet/http/TestHttpServlet.java | 5 +-
test/javax/servlet/jsp/TestPageContext.java | 12 +-
.../authenticator/TestDigestAuthenticator.java | 5 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 4 +-
.../apache/catalina/comet/TestCometProcessor.java | 18 +-
.../catalina/connector/TestCoyoteAdapter.java | 73 ++-
.../catalina/connector/TestOutputBuffer.java | 6 +
.../org/apache/catalina/connector/TestRequest.java | 19 +-
.../apache/catalina/connector/TestResponse.java | 18 +-
.../catalina/core/TestApplicationContext.java | 52 +-
.../catalina/core/TestApplicationFilterConfig.java | 5 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 164 +++---
.../catalina/core/TestNamingContextListener.java | 13 +-
.../apache/catalina/core/TestStandardContext.java | 16 +-
.../catalina/core/TestStandardContextAliases.java | 6 +-
.../catalina/core/TestStandardContextValve.java | 11 +-
.../catalina/core/TestStandardHostValve.java | 6 +-
.../apache/catalina/core/TestStandardWrapper.java | 21 +-
.../catalina/core/TestSwallowAbortedUploads.java | 4 +-
test/org/apache/catalina/core/TesterContext.java | 20 +-
.../catalina/filters/TestAddCharSetFilter.java | 5 +-
.../apache/catalina/filters/TestCorsFilter.java | 83 ++-
.../filters/TestCsrfPreventionFilter2.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 2 +-
.../catalina/filters/TestRemoteIpFilter.java | 2 +-
.../filters/TesterHttpServletResponse.java | 29 +-
.../catalina/filters/TesterServletContext.java | 32 +-
.../catalina/loader/TestVirtualWebappLoader.java | 6 +-
.../catalina/loader/TestWebappClassLoader.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 5 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 11 +-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 14 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 5 +-
.../apache/catalina/mbeans/TestRegistration.java | 4 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 16 +-
.../realm/TestMessageDigestCredentialHandler.java | 58 ++
test/org/apache/catalina/realm/TestRealmBase.java | 6 +-
.../realm/TestSecretKeyCredentialHandler.java | 49 ++
.../catalina/servlets/TestDefaultServlet.java | 10 +-
.../catalina/servlets/TestWebdavServlet.java | 4 +-
.../catalina/session/TestPersistentManager.java | 6 +-
.../catalina/session/TestStandardSession.java | 6 +-
test/org/apache/catalina/session/Threading.java | 5 +-
.../apache/catalina/startup/LoggingBaseTest.java | 11 +-
test/org/apache/catalina/startup/TestListener.java | 4 +-
test/org/apache/catalina/startup/TestTomcat.java | 41 +-
.../catalina/startup/TestTomcatClassLoader.java | 10 +-
.../apache/catalina/startup/TomcatBaseTest.java | 41 +-
test/org/apache/catalina/tribes/TesterUtil.java | 2 +-
.../catalina/tribes/demos/IntrospectionUtils.java | 4 +-
test/org/apache/catalina/tribes/demos/MapDemo.java | 7 +-
.../catalina/valves/TestErrorReportValve.java | 29 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 8 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 15 +-
test/org/apache/coyote/ajp/TesterAjpMessage.java | 6 +
.../coyote/http11/TestAbstractHttp11Processor.java | 65 ++-
.../apache/coyote/http11/TestGzipOutputFilter.java | 2 +-
.../http11/filters/TestChunkedInputFilter.java | 25 +-
.../apache/coyote/http11/upgrade/TestUpgrade.java | 5 +-
test/org/apache/el/TestELEvaluation.java | 14 +-
test/org/apache/el/TestELInJsp.java | 300 ++++-------
test/org/apache/el/TestValueExpressionImpl.java | 4 +-
test/org/apache/el/lang/TestELSupport.java | 34 ++
.../org/apache/el/lang/TesterBean.java | 6 +-
.../lang/TesterType.java} | 14 +-
.../org/apache/el/lang/TesterTypeEditorBase.java | 59 ++-
.../TesterTypeEditorError.java} | 9 +-
.../TesterTypeEditorNoError.java} | 9 +-
test/org/apache/jasper/compiler/TestELParser.java | 4 +-
test/org/apache/jasper/compiler/TestNode.java | 58 +-
.../{TestNode.java => TestNodeIntegration.java} | 2 +-
test/org/apache/jasper/compiler/TestParser.java | 6 +-
.../org/apache/juli/TestClassLoaderLogManager.java | 12 +-
.../apache/naming/resources/TestNamingContext.java | 25 +-
.../apache/naming/resources/TestWarDirContext.java | 6 +-
test/org/apache/tomcat/util/buf/TestByteChunk.java | 2 +-
test/org/apache/tomcat/util/buf/TestHexUtils.java | 11 +
.../apache/tomcat/util/http/CookiesBaseTest.java | 14 +-
test/org/apache/tomcat/util/http/TestBug49158.java | 9 +-
.../apache/tomcat/util/http/TestCookieParsing.java | 331 ++++++++++++
.../util/http/TestCookieProcessorGeneration.java | 337 ++++++++++++
.../http/TestCookieProcessorGenerationHttp.java | 86 +++
test/org/apache/tomcat/util/http/TestCookies.java | 16 +-
.../tomcat/util/http/TestCookiesAllowEquals.java | 109 ----
.../tomcat/util/http/TestCookiesAllowHttpSeps.java | 104 ----
.../tomcat/util/http/TestCookiesAllowNameOnly.java | 108 ----
.../util/http/TestCookiesDefaultSysProps.java | 10 +-
.../util/http/TestCookiesDisallowEquals.java | 101 ----
.../util/http/TestCookiesNoFwdStrictSysProps.java | 10 +-
.../http/TestCookiesNoStrictNamingSysProps.java | 10 +-
.../util/http/TestCookiesStrictSysProps.java | 10 +-
.../apache/tomcat/util/http/TestMimeHeaders.java | 174 +-----
...eaders.java => TestMimeHeadersIntegration.java} | 2 +-
.../tomcat/util/http/TestSetCookieSupport.java | 196 -------
.../TestSetCookieSupportSeparatorsAllowed.java | 194 -------
.../tomcat/util/http/TesterCookiesPerformance.java | 26 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 78 +--
.../tomcat/util/net/jsse/openssl/TestCipher.java | 4 +-
.../util/net/jsse/openssl/TesterOpenSSL.java | 4 +-
.../tomcat/util/scan/TestStandardJarScanner.java | 90 ++++
.../tomcat/websocket/TestWebSocketFrameClient.java | 5 +-
.../websocket/TestWebSocketFrameClientSSL.java | 10 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 5 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 5 +-
.../tomcat/websocket/TestWsSubprotocols.java | 5 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 111 ++--
.../tomcat/websocket/TesterConnectionLimit.java | 7 +-
.../tomcat/websocket/TesterWsClientAutobahn.java | 23 +-
.../websocket/pojo/TestEncodingDecoding.java | 46 +-
.../websocket/pojo/TestPojoEndpointBase.java | 10 +-
.../websocket/pojo/TestPojoMethodMapping.java | 5 +-
.../websocket/server/TestWsServerContainer.java | 5 +-
test/webapp/bug45nnn/bug45451.jspf | 22 +-
test/webapp/bug45nnn/bug45451d.jspx | 22 +-
.../bug5nnnn/bug57141.jsp} | 8 +-
webapps/docs/changelog.xml | 385 +++++++++++++-
webapps/docs/class-loader-howto.xml | 4 +-
webapps/docs/config/cluster-manager.xml | 16 +
webapps/docs/config/context.xml | 15 +-
webapps/docs/config/cookie-processor.xml | 223 ++++++++
webapps/docs/config/credentialhandler.xml | 219 ++++++++
webapps/docs/config/engine.xml | 6 +
webapps/docs/config/http.xml | 20 +-
webapps/docs/config/listeners.xml | 20 +-
webapps/docs/config/manager.xml | 92 ++--
webapps/docs/config/project.xml | 2 +
webapps/docs/config/realm.xml | 32 +-
webapps/docs/config/systemprops.xml | 46 +-
webapps/docs/index.xml | 4 +-
webapps/docs/logging.xml | 131 ++---
webapps/docs/project.xml | 2 +-
webapps/docs/realm-howto.xml | 45 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/web-socket-howto.xml | 2 +-
webapps/docs/windows-auth-howto.xml | 9 +-
502 files changed, 8594 insertions(+), 5204 deletions(-)
create mode 100644 conf/tomcat-users.xsd
create mode 100644 java/org/apache/catalina/CredentialHandler.java
create mode 100644 java/org/apache/catalina/realm/DigestCredentialHandlerBase.java
create mode 100644 java/org/apache/catalina/realm/MessageDigestCredentialHandler.java
create mode 100644 java/org/apache/catalina/realm/NestedCredentialHandler.java
create mode 100644 java/org/apache/catalina/realm/SecretKeyCredentialHandler.java
copy java/org/apache/catalina/startup/{RealmRuleSet.java => CredentialHandlerRuleSet.java} (74%)
copy java/org/apache/catalina/storeconfig/{SenderSF.java => JarScannerSF.java} (64%)
copy java/org/apache/{jasper => catalina/tribes}/util/ExceptionUtils.java (71%)
create mode 100644 java/org/apache/catalina/webresources/EmptyResourceSet.java
copy java/{javax/el/EvaluationListener.java => org/apache/juli/WebappProperties.java} (52%)
copy java/org/apache/tomcat/util/{net/Constants.java => http/CookieProcessor.java} (59%)
rename java/org/apache/tomcat/util/http/{Cookies.java => LegacyCookieProcessor.java} (50%)
create mode 100644 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
create mode 100644 test/org/apache/catalina/realm/TestMessageDigestCredentialHandler.java
create mode 100644 test/org/apache/catalina/realm/TestSecretKeyCredentialHandler.java
copy webapps/examples/WEB-INF/classes/websocket/snake/Direction.java => test/org/apache/el/lang/TesterBean.java (90%)
copy test/org/apache/{catalina/webresources/TestDirResourceSet.java => el/lang/TesterType.java} (79%)
copy java/javax/el/TypeConverter.java => test/org/apache/el/lang/TesterTypeEditorBase.java (52%)
copy test/org/apache/el/{TesterEnum.java => lang/TesterTypeEditorError.java} (79%)
copy test/org/apache/el/{TesterEnum.java => lang/TesterTypeEditorNoError.java} (80%)
copy test/org/apache/jasper/compiler/{TestNode.java => TestNodeIntegration.java} (96%)
create mode 100644 test/org/apache/tomcat/util/http/TestCookieParsing.java
create mode 100644 test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
create mode 100644 test/org/apache/tomcat/util/http/TestCookieProcessorGenerationHttp.java
delete mode 100644 test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
delete mode 100644 test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java
delete mode 100644 test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
delete mode 100644 test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java
copy test/org/apache/tomcat/util/http/{TestMimeHeaders.java => TestMimeHeadersIntegration.java} (99%)
delete mode 100644 test/org/apache/tomcat/util/http/TestSetCookieSupport.java
delete mode 100644 test/org/apache/tomcat/util/http/TestSetCookieSupportSeparatorsAllowed.java
create mode 100644 test/org/apache/tomcat/util/scan/TestStandardJarScanner.java
copy test/{webapp-2.4/el-as-literal.jsp => webapp/bug5nnnn/bug57141.jsp} (79%)
create mode 100644 webapps/docs/config/cookie-processor.xml
create mode 100644 webapps/docs/config/credentialhandler.xml
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list