[tomcat7] branch master updated (3cd5015 -> 1c5d2a2)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Feb 18 22:07:05 GMT 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch master
in repository tomcat7.

      from  3cd5015   Upload to unstable
      adds  f8d2cf6   Imported Upstream version 7.0.65
       new  2648dcc   Merge tag 'upstream/7.0.65'
       new  cd15d0f   Refreshed the patches
      adds  8d29698   Imported Upstream version 7.0.67
       new  901e1e3   Merge tag 'upstream/7.0.67'
       new  bb26fef   Refreshed the patches
       new  c74d322   Use LC_ALL instead of LANG to format the date and make the documentation reproducible on the builders
       new  d33e481   New build dependencies on easymock, cglib and objenesis
       new  d634389   Standards-Version updated to 3.9.7
       new  3f21a38   Use secure Vcs-* URLs
      adds  0a20155   Imported Upstream version 7.0.68
       new  7801818   Merge tag 'upstream/7.0.68'
       new  256d413   Added ASM to the test classpath (required by Easymock)
       new  1c5d2a2   Upload to unstable

The 11 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                                       |   24 +-
 NOTICE                                             |    2 +-
 RUNNING.txt                                        |    8 +-
 bin/catalina.bat                                   |    4 +-
 bin/catalina.sh                                    |   12 +-
 build.properties.default                           |   29 +-
 build.xml                                          |   34 +-
 conf/web.xml                                       |   24 +-
 debian/ant.properties                              |    3 +
 debian/changelog                                   |   14 +
 debian/control                                     |    9 +-
 debian/copyright                                   |    9 +-
 ...-deploy-webapps-target-from-deploy-target.patch |    4 +-
 debian/patches/0010-debianize-build-xml.patch      |    4 +-
 .../0011-fix-classpath-lintian-warnings.patch      |   10 +-
 ...nt-look-for-build-properties-in-user-home.patch |    2 +-
 debian/patches/0017-use-jdbc-pool-default.patch    |    4 +-
 .../0019-add-distribution-to-error-page.patch      |    2 +-
 debian/patches/0022-update-test-certificates.patch |   24 +-
 ...ble-unit-tests-depending-on-network-access.path |   61 +-
 .../patches/0026-add-asm-to-test-classpath.patch   |   13 +
 debian/patches/series                              |    1 +
 debian/rules                                       |    2 +-
 java/javax/el/BeanELResolver.java                  |   16 +-
 java/javax/servlet/http/Cookie.java                |   13 +-
 java/org/apache/catalina/Context.java              |  100 +
 java/org/apache/catalina/Globals.java              |   35 +-
 java/org/apache/catalina/Lifecycle.java            |   51 +-
 java/org/apache/catalina/LifecycleState.java       |   16 +
 java/org/apache/catalina/Manager.java              |   37 +-
 java/org/apache/catalina/Session.java              |   19 +
 java/org/apache/catalina/SessionIdGenerator.java   |    1 -
 .../apache/catalina/ant/AbstractCatalinaTask.java  |   34 +-
 .../catalina/ant/jmx/JMXAccessorQueryTask.java     |    4 +-
 .../catalina/ant/jmx/JMXAccessorSetTask.java       |    8 +-
 .../apache/catalina/ant/jmx/JMXAccessorTask.java   |    8 +-
 .../authenticator/DigestAuthenticator.java         |    2 +-
 .../catalina/authenticator/FormAuthenticator.java  |   14 +
 .../catalina/authenticator/LocalStrings.properties |    2 +-
 .../catalina/authenticator/SingleSignOn.java       |    3 +-
 .../authenticator/SingleSignOnListener.java        |    3 -
 .../authenticator/SpnegoAuthenticator.java         |    4 +-
 .../catalina/connector/ClientAbortException.java   |    4 +-
 .../apache/catalina/connector/CometEventImpl.java  |    3 +-
 java/org/apache/catalina/connector/Connector.java  |    6 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |   69 +-
 .../org/apache/catalina/connector/InputBuffer.java |    6 +-
 .../catalina/connector/LocalStrings.properties     |    4 +
 .../apache/catalina/connector/MapperListener.java  |    3 +-
 .../apache/catalina/connector/OutputBuffer.java    |    6 +-
 java/org/apache/catalina/connector/Request.java    |  145 +-
 java/org/apache/catalina/connector/Response.java   |   55 +-
 .../catalina/connector/mbeans-descriptors.xml      |    7 +-
 .../apache/catalina/core/ApplicationContext.java   |    5 +-
 .../catalina/core/ApplicationDispatcher.java       |    7 +-
 .../catalina/core/ApplicationFilterConfig.java     |    6 +-
 .../catalina/core/ApplicationHttpRequest.java      |  108 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |   47 +-
 java/org/apache/catalina/core/ContainerBase.java   |   10 +-
 .../catalina/core/DefaultInstanceManager.java      |   76 +-
 .../core/JreMemoryLeakPreventionListener.java      |   33 +-
 .../apache/catalina/core/LocalStrings.properties   |   17 +-
 .../catalina/core/NamingContextListener.java       |    2 +-
 .../catalina/core/RestrictedServlets.properties    |    1 +
 java/org/apache/catalina/core/StandardContext.java |  119 +-
 java/org/apache/catalina/core/StandardHost.java    |    6 +-
 .../apache/catalina/core/StandardHostValve.java    |   18 +-
 java/org/apache/catalina/core/StandardServer.java  |   17 +-
 java/org/apache/catalina/core/StandardService.java |   17 +-
 java/org/apache/catalina/core/StandardWrapper.java |   43 +-
 .../apache/catalina/core/StandardWrapperValve.java |    4 +-
 .../apache/catalina/core/mbeans-descriptors.xml    |   12 +
 .../apache/catalina/deploy/InjectionTarget.java    |    7 +-
 .../apache/catalina/deploy/LocalStrings.properties |    4 +-
 .../apache/catalina/deploy/NamingResources.java    |   28 +-
 .../apache/catalina/deploy/SecurityRoleRef.java    |    4 +-
 java/org/apache/catalina/filters/Constants.java    |    9 +
 .../catalina/filters/CsrfPreventionFilter.java     |  125 +-
 .../catalina/filters/CsrfPreventionFilterBase.java |  140 +
 .../org/apache/catalina/filters/ExpiresFilter.java |  432 +--
 .../catalina/filters/HttpHeaderSecurityFilter.java |   53 +-
 .../catalina/filters/LocalStrings.properties       |    6 +-
 .../apache/catalina/filters/RemoteIpFilter.java    |   73 +-
 .../catalina/filters/RequestDumperFilter.java      |    6 +-
 .../catalina/filters/RestCsrfPreventionFilter.java |  251 ++
 java/org/apache/catalina/ha/ClusterManager.java    |    8 +
 java/org/apache/catalina/ha/ClusterRuleSet.java    |   25 +-
 .../apache/catalina/ha/session/BackupManager.java  |    5 -
 .../catalina/ha/session/ClusterManagerBase.java    |   67 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  156 +-
 .../apache/catalina/ha/session/DeltaSession.java   |   66 +-
 .../catalina/ha/session/JvmRouteBinderValve.java   |    4 +-
 .../catalina/ha/session/LocalStrings.properties    |    6 +-
 .../catalina/ha/session/mbeans-descriptors.xml     |   24 +
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |   29 +-
 .../apache/catalina/loader/JdbcLeakPrevention.java |   13 +-
 .../apache/catalina/loader/LocalStrings.properties |    1 +
 .../catalina/loader/ParallelWebappClassLoader.java |  100 +
 .../catalina/loader/StandardClassLoader.java       |    2 +-
 .../apache/catalina/loader/WebappClassLoader.java  | 3772 +-------------------
 ...ClassLoader.java => WebappClassLoaderBase.java} |  375 +-
 java/org/apache/catalina/loader/WebappLoader.java  |   11 +-
 .../apache/catalina/loader/mbeans-descriptors.xml  |   44 +
 java/org/apache/catalina/manager/Constants.java    |    2 +-
 .../apache/catalina/manager/DummyProxySession.java |    5 +
 .../catalina/manager/HTMLManagerServlet.java       |   26 +-
 .../catalina/manager/LocalStrings.properties       |    2 +-
 .../apache/catalina/manager/ManagerServlet.java    |   14 +-
 .../apache/catalina/manager/StatusTransformer.java |    4 +-
 .../apache/catalina/manager/host/Constants.java    |    2 +-
 .../catalina/manager/util/ReverseComparator.java   |   47 -
 .../apache/catalina/manager/util/SessionUtils.java |   10 +-
 .../mbeans/GlobalResourcesLifecycleListener.java   |   32 +-
 .../mbeans/JmxRemoteLifecycleListener.java         |    6 +-
 java/org/apache/catalina/mbeans/MBeanDumper.java   |    6 +-
 java/org/apache/catalina/mbeans/MBeanFactory.java  |    4 +-
 java/org/apache/catalina/mbeans/MBeanUtils.java    |   30 +-
 java/org/apache/catalina/realm/CombinedRealm.java  |   11 +
 .../org/apache/catalina/realm/DataSourceRealm.java |   15 +-
 java/org/apache/catalina/realm/JNDIRealm.java      |   31 +-
 .../apache/catalina/realm/LocalStrings.properties  |    2 +-
 .../catalina/realm/LocalStrings_es.properties      |    2 +-
 java/org/apache/catalina/realm/MemoryRealm.java    |   59 +-
 java/org/apache/catalina/realm/RealmBase.java      |    4 +-
 .../catalina/security/SecurityClassLoad.java       |    2 +-
 java/org/apache/catalina/servlets/CGIServlet.java  |   70 +-
 .../apache/catalina/servlets/DefaultServlet.java   |  202 +-
 .../apache/catalina/servlets/WebdavServlet.java    |   68 +-
 java/org/apache/catalina/session/Constants.java    |   19 +-
 java/org/apache/catalina/session/FileStore.java    |  153 +-
 java/org/apache/catalina/session/JDBCStore.java    |  228 +-
 .../catalina/session/LocalStrings.properties       |    4 +
 java/org/apache/catalina/session/ManagerBase.java  |  519 +--
 .../apache/catalina/session/PersistentManager.java |   22 +-
 .../catalina/session/PersistentManagerBase.java    |   98 +-
 .../apache/catalina/session/StandardManager.java   |  152 +-
 .../apache/catalina/session/StandardSession.java   |  147 +-
 .../catalina/session/StandardSessionFacade.java    |   11 +-
 java/org/apache/catalina/session/StoreBase.java    |   76 +-
 .../apache/catalina/session/mbeans-descriptors.xml |   24 +
 java/org/apache/catalina/ssi/SSIFsize.java         |    4 +-
 java/org/apache/catalina/startup/Bootstrap.java    |   35 +-
 java/org/apache/catalina/startup/Catalina.java     |  118 +-
 .../catalina/startup/ClassLoaderFactory.java       |   24 +-
 .../org/apache/catalina/startup/ContextConfig.java |  104 +-
 .../org/apache/catalina/startup/FailedContext.java |   29 +
 .../apache/catalina/startup/HomesUserDatabase.java |    7 +-
 java/org/apache/catalina/startup/HostConfig.java   |  226 +-
 .../catalina/startup/LocalStrings.properties       |   13 +-
 java/org/apache/catalina/startup/RealmRuleSet.java |   31 +-
 java/org/apache/catalina/startup/TldConfig.java    |    2 +-
 java/org/apache/catalina/startup/Tomcat.java       |   89 +-
 java/org/apache/catalina/startup/UserConfig.java   |    4 +-
 java/org/apache/catalina/startup/WebRuleSet.java   |   14 +-
 .../catalina/startup/WebappServiceLoader.java      |    6 +-
 java/org/apache/catalina/tribes/UniqueId.java      |    4 +-
 .../interceptors/DomainFilterInterceptor.java      |    2 +-
 .../interceptors/StaticMembershipInterceptor.java  |  136 +-
 .../group/interceptors/TcpFailureDetector.java     |   60 +-
 .../org/apache/catalina/tribes/io/XByteBuffer.java |   12 +-
 .../catalina/tribes/membership/McastService.java   |   18 +-
 .../tribes/tipis/AbstractReplicatedMap.java        |   28 +-
 .../catalina/tribes/tipis/ReplicatedMap.java       |    4 +-
 .../catalina/tribes/transport/bio/BioSender.java   |   16 +-
 .../catalina/tribes/util/TcclThreadFactory.java    |    1 +
 .../apache/catalina/users/MemoryUserDatabase.java  |   69 +-
 .../catalina/users/MemoryUserDatabaseFactory.java  |    2 +-
 .../catalina/util/CustomObjectInputStream.java     |   99 +-
 .../apache/catalina/util/ExtensionValidator.java   |    3 +
 java/org/apache/catalina/util/LifecycleBase.java   |   82 +-
 .../apache/catalina/util/LocalStrings.properties   |    2 +
 .../catalina/util/StandardSessionIdGenerator.java  |    1 -
 .../catalina/valves/ExtendedAccessLogValve.java    |   16 +-
 .../apache/catalina/valves/JDBCAccessLogValve.java |   16 +-
 .../apache/catalina/valves/PersistentValve.java    |    7 +-
 .../apache/catalina/valves/RemoteAddrValve.java    |    2 +-
 .../apache/catalina/valves/RemoteHostValve.java    |    2 +-
 java/org/apache/catalina/websocket/WsOutbound.java |    4 +-
 java/org/apache/coyote/Constants.java              |    4 +-
 java/org/apache/coyote/Request.java                |    9 +-
 java/org/apache/coyote/Response.java               |   26 +-
 .../apache/coyote/ajp/AbstractAjpProcessor.java    |   20 +-
 .../org/apache/coyote/ajp/AbstractAjpProtocol.java |   18 +
 java/org/apache/coyote/ajp/AjpAprProtocol.java     |    1 +
 java/org/apache/coyote/ajp/AjpNioProtocol.java     |    1 +
 java/org/apache/coyote/ajp/AjpProtocol.java        |    1 +
 .../coyote/http11/AbstractHttp11Processor.java     |   19 +-
 .../apache/coyote/http11/AbstractInputBuffer.java  |    2 -
 .../coyote/http11/InternalAprInputBuffer.java      |   12 +-
 .../apache/coyote/http11/LocalStrings.properties   |    3 +
 .../coyote/http11/filters/ChunkedInputFilter.java  |    6 +-
 .../upgrade/AbstractServletOutputStream.java       |    2 +-
 java/org/apache/el/lang/ELArithmetic.java          |   16 +-
 java/org/apache/el/lang/ELSupport.java             |    4 +-
 java/org/apache/el/lang/ExpressionBuilder.java     |   16 +-
 java/org/apache/el/parser/AstValue.java            |   19 +-
 java/org/apache/el/parser/ELParser.jjt             |    2 +-
 .../org/apache/el/parser/ELParserTokenManager.java |    2 +-
 java/org/apache/el/util/MessageFactory.java        |   12 +-
 java/org/apache/el/util/Validation.java            |   19 +-
 java/org/apache/jasper/Constants.java              |    2 +-
 java/org/apache/jasper/EmbeddedServletOptions.java |   28 +
 java/org/apache/jasper/JspC.java                   |  209 +-
 java/org/apache/jasper/Options.java                |    6 +
 .../apache/jasper/compiler/AttributeParser.java    |   45 +-
 java/org/apache/jasper/compiler/Compiler.java      |   53 +-
 java/org/apache/jasper/compiler/ELParser.java      |    9 +-
 java/org/apache/jasper/compiler/Generator.java     |  125 +-
 .../jasper/compiler/ImplicitTagLibraryInfo.java    |    2 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   |   79 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |   14 +-
 .../apache/jasper/compiler/JspDocumentParser.java  |   14 +-
 java/org/apache/jasper/compiler/JspReader.java     |   42 +-
 java/org/apache/jasper/compiler/JspUtil.java       |    4 +-
 java/org/apache/jasper/compiler/Node.java          |    2 +-
 java/org/apache/jasper/compiler/PageInfo.java      |    4 +-
 java/org/apache/jasper/compiler/Parser.java        |  127 +-
 .../apache/jasper/compiler/ParserController.java   |    2 +-
 .../apache/jasper/compiler/ScriptingVariabler.java |    4 +-
 java/org/apache/jasper/compiler/SmapUtil.java      |   32 +-
 .../apache/jasper/compiler/TagFileProcessor.java   |   15 +-
 .../apache/jasper/compiler/TagPluginManager.java   |   38 +-
 .../apache/jasper/compiler/TldLocationsCache.java  |    8 +-
 .../jasper/resources/LocalStrings.properties       |    3 +-
 .../org/apache/jasper/runtime/BodyContentImpl.java |    2 +-
 java/org/apache/jasper/runtime/JspFactoryImpl.java |    4 +-
 .../apache/jasper/runtime/JspRuntimeLibrary.java   |   43 +-
 .../org/apache/jasper/runtime/PageContextImpl.java |    2 +-
 .../apache/jasper/servlet/JspCServletContext.java  |    3 +
 java/org/apache/jasper/servlet/JspServlet.java     |    2 +-
 java/org/apache/jasper/tagplugins/jstl/Util.java   |    6 +-
 .../org/apache/jasper/util/FastRemovalDequeue.java |   24 +-
 .../jasper/xmlparser/XMLEncodingDetector.java      |    2 +-
 java/org/apache/juli/AsyncFileHandler.java         |    2 -
 java/org/apache/juli/ClassLoaderLogManager.java    |   18 +-
 java/org/apache/juli/JdkLoggerFormatter.java       |    6 +-
 java/org/apache/naming/factory/BeanFactory.java    |   12 +-
 .../apache/naming/factory/ResourceLinkFactory.java |    5 +
 .../resources/ClasspathURLStreamHandler.java       |   50 +
 .../DirContextURLStreamHandlerFactory.java         |    7 +-
 .../apache/naming/resources/EmptyDirContext.java   |    8 +-
 .../apache/naming/resources/FileDirContext.java    |   37 +-
 .../naming/resources/LocalStrings.properties       |    1 +
 .../org/apache/naming/resources/ResourceCache.java |   38 +-
 .../org/apache/naming/resources/WARDirContext.java |   13 +-
 .../apache/tomcat/InstrumentableClassLoader.java   |    4 +-
 java/org/apache/tomcat/buildutil/Txt2Html.java     |   69 +-
 java/org/apache/tomcat/jni/Library.java            |   11 +-
 java/org/apache/tomcat/jni/Socket.java             |    6 +-
 .../org/apache/tomcat/util/IntrospectionUtils.java |   12 +-
 java/org/apache/tomcat/util/buf/C2BConverter.java  |    8 +-
 java/org/apache/tomcat/util/buf/MessageBytes.java  |   40 +-
 java/org/apache/tomcat/util/buf/UDecoder.java      |    2 +-
 .../tomcat/util/codec/binary/BaseNCodec.java       |    7 +-
 java/org/apache/tomcat/util/compat/JreCompat.java  |   13 +-
 java/org/apache/tomcat/util/compat/JreVendor.java  |   49 +
 .../tomcat/util/digester/CallMethodRule.java       |    5 -
 .../apache/tomcat/util/digester/XercesParser.java  |    4 +-
 .../apache/tomcat/util/file/ConfigFileLoader.java  |   85 +
 .../org/apache/tomcat/util/http/CookieSupport.java |   25 +-
 java/org/apache/tomcat/util/http/Cookies.java      |    2 +-
 .../tomcat/util/http/FastHttpDateFormat.java       |    4 +-
 java/org/apache/tomcat/util/http/Parameters.java   |    2 +-
 java/org/apache/tomcat/util/http/RequestUtil.java  |   20 +-
 .../org/apache/tomcat/util/http/mapper/Mapper.java |   71 +-
 .../apache/tomcat/util/http/parser/HttpParser.java |    4 +-
 .../apache/tomcat/util/modeler/BaseModelMBean.java |    2 -
 .../apache/tomcat/util/modeler/ManagedBean.java    |  122 +-
 .../tomcat/util/modeler/NotificationInfo.java      |   40 +-
 .../apache/tomcat/util/modeler/OperationInfo.java  |   33 +-
 java/org/apache/tomcat/util/modeler/Registry.java  |    6 +-
 .../modules/MbeansDescriptorsSerSource.java        |   19 +-
 .../apache/tomcat/util/net/AbstractEndpoint.java   |   26 +-
 java/org/apache/tomcat/util/net/AprEndpoint.java   |   31 +-
 java/org/apache/tomcat/util/net/NioChannel.java    |   12 -
 java/org/apache/tomcat/util/net/NioEndpoint.java   |    9 +-
 .../apache/tomcat/util/net/NioSelectorPool.java    |    2 +-
 .../apache/tomcat/util/net/SecureNioChannel.java   |   11 +-
 .../apache/tomcat/util/net/SocketProperties.java   |    2 +-
 java/org/apache/tomcat/util/net/URL.java           |    6 +-
 .../tomcat/util/net/jsse/JSSESocketFactory.java    |   38 +-
 .../tomcat/util/net/res/LocalStrings.properties    |    1 +
 java/org/apache/tomcat/util/res/StringManager.java |   76 +-
 .../tomcat/util/scan/StandardJarScanner.java       |    7 +-
 .../websocket/AsyncChannelWrapperSecure.java       |    4 +-
 .../tomcat/websocket/LocalStrings.properties       |   11 +-
 .../apache/tomcat/websocket/PerMessageDeflate.java |    4 +
 java/org/apache/tomcat/websocket/WsFrameBase.java  |    8 +-
 .../org/apache/tomcat/websocket/WsFrameClient.java |    6 +
 .../tomcat/websocket/WsRemoteEndpointImplBase.java |   51 +-
 java/org/apache/tomcat/websocket/WsSession.java    |   68 +-
 .../tomcat/websocket/WsWebSocketContainer.java     |  255 +-
 .../tomcat/websocket/pojo/PojoMethodMapping.java   |    9 +-
 .../apache/tomcat/websocket/server/Constants.java  |    4 +
 .../websocket/server/LocalStrings.properties       |    3 +
 .../tomcat/websocket/server/WsFrameServer.java     |   21 +-
 .../websocket/server/WsHandshakeRequest.java       |    6 +-
 .../websocket/server/WsHttpUpgradeHandler.java     |    2 +
 .../tomcat/websocket/server/WsServerContainer.java |    2 +
 modules/jdbc-pool/NOTICE                           |    2 +-
 modules/jdbc-pool/doc/jdbc-pool.xml                |    1 +
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    |   46 +-
 .../apache/tomcat/jdbc/pool/DataSourceFactory.java |   14 +-
 .../apache/tomcat/jdbc/pool/PoolProperties.java    |    8 +-
 .../apache/tomcat/jdbc/pool/PooledConnection.java  |    2 +-
 .../jdbc/pool/interceptor/ResetAbandonedTimer.java |    2 -
 .../jdbc/pool/interceptor/SlowQueryReport.java     |   35 +-
 .../jdbc/pool/interceptor/SlowQueryReportJmx.java  |    1 -
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       |    6 +
 .../tomcat/jdbc/test/TestSlowQueryComparator.java  |  123 +
 res/checkstyle/org-import-control.xml              |    1 +
 res/findbugs/filter-false-positives.xml            |  411 ++-
 res/ide-support/eclipse/eclipse.classpath          |    1 +
 res/maven/mvn.properties.default                   |    2 +-
 .../authenticator/TestDigestAuthenticator.java     |    6 +-
 .../TestNonLoginAndBasicAuthenticator.java         |    6 +-
 .../TestSSOnonLoginAndBasicAuthenticator.java      |    8 +-
 .../TestSSOnonLoginAndDigestAuthenticator.java     |    4 +-
 .../apache/catalina/comet/TestCometProcessor.java  |   12 +-
 .../org/apache/catalina/connector/TestRequest.java |   21 +
 .../apache/catalina/connector/TestResponse.java    |  213 ++
 .../connector/TestResponsePerformance.java         |   12 +-
 .../catalina/core/TestApplicationHttpRequest.java  |  357 ++
 .../apache/catalina/core/TestAsyncContextImpl.java |   72 +-
 .../catalina/core/TestStandardHostValve.java       |    3 +-
 .../catalina/filters/TestRemoteIpFilter.java       |   97 +-
 .../filters/TestRestCsrfPreventionFilter.java      |  429 +++
 .../filters/TestRestCsrfPreventionFilter2.java     |  371 ++
 .../catalina/filters/TesterFilterConfigs.java      |    2 +
 .../ha/session/TestSerializablePrincipal.java      |   21 +-
 .../loader/TestParallelWebappClassLoader.java      |  134 +
 .../apache/catalina/loader/TestVirtualContext.java |   33 +-
 .../loader/TestWebappClassLoaderMemoryLeak.java    |    2 +-
 ...TestWebappClassLoaderThreadLocalMemoryLeak.java |   16 +-
 .../loader/TestWebappClassLoaderWeaving.java       |   17 +-
 test/org/apache/catalina/realm/TestJNDIRealm.java  |  166 +
 test/org/apache/catalina/realm/TestRealmBase.java  |    8 +-
 .../catalina/session/TestPersistentManager.java    |    6 +-
 .../catalina/session/TestStandardSession.java      |  177 +-
 ...on.java => TestStandardSessionIntegration.java} |    4 +-
 test/org/apache/catalina/startup/TestTomcat.java   |   35 +-
 .../catalina/startup/TestTomcatClassLoader.java    |    4 +-
 .../apache/catalina/startup/TestWebRuleSet.java    |   14 +-
 .../catalina/startup/TestWebappServiceLoader.java  |    1 -
 .../apache/catalina/startup/TomcatBaseTest.java    |    3 +-
 .../catalina/tribes/demos/ChannelCreator.java      |    2 +-
 .../test/channel/TestRemoteProcessException.java   |   29 +-
 .../tribes/test/transport/SocketReceive.java       |    1 -
 .../catalina/tribes/test/transport/SocketSend.java |    2 +-
 .../catalina/valves/TesterAccessLogValve.java      |   10 +-
 .../apache/catalina/websocket/TestWebSocket.java   |    2 +-
 .../coyote/ajp/TestAbstractAjpProcessor.java       |    2 +-
 test/org/apache/el/TestELEvaluation.java           |   27 +
 test/org/apache/el/TestELInJsp.java                |   83 +-
 .../jasper/compiler/TestAttributeParser.java       |   25 +-
 test/org/apache/jasper/compiler/TestELParser.java  |   17 +-
 test/org/apache/jasper/compiler/TestParser.java    |    6 +-
 .../runtime/TestCustomHttpJspPage.java}            |   23 +-
 .../apache/jasper/runtime/TesterHttpJspBase.java   |   69 +-
 .../resources/TestClasspathUrlStreamHandler.java}  |   47 +-
 .../core => tomcat/unittest}/TesterContext.java    |   38 +-
 .../unittest}/TesterRequest.java                   |   67 +-
 .../unittest}/TesterResponse.java                  |    4 +-
 .../unittest}/TesterServletContext.java            |   17 +-
 .../tomcat/unittest/TesterSessionCookieConfig.java |   93 +
 .../apache/tomcat/util/bcel/TesterPerformance.java |    3 +
 .../tomcat/util/file/TestConfigFileLoader.java     |   85 +
 .../apache/tomcat/util/http/TestRequestUtil.java   |   30 +
 .../apache/tomcat/util/http/mapper/TestMapper.java |   36 +-
 .../tomcat/util/http/mapper/TestMapperWebapps.java |   65 +
 test/org/apache/tomcat/util/net/TestSsl.java       |    3 +-
 test/org/apache/tomcat/util/net/TesterSupport.java |   73 +-
 .../websocket/TestWebSocketFrameClientSSL.java     |    3 +-
 .../tomcat/websocket/TestWsWebSocketContainer.java |   62 +-
 .../TestWsWebSocketContainerWithProxy.java         |   51 +
 .../apache/tomcat/websocket/TesterEchoServer.java  |    2 +-
 .../tomcat/websocket/TesterWsClientAutobahn.java   |    2 +-
 .../websocket/pojo/TestPojoMethodMapping.java      |    4 +-
 .../apache/tomcat/websocket/server/TestClose.java  |  360 ++
 .../server/TestWsRemoteEndpointImplServer.java     |  175 +
 .../websocket/server/TestWsServerContainer.java    |    2 +-
 .../websocket/server/TesterWsCloseClient.java      |  127 +
 test/webapp-3.0/bug45nnn/bug45427.jsp              |   28 +-
 test/webapp-3.0/bug45nnn/bug45451.jspf             |    8 +-
 .../bug5nnnn/{bug58096.jsp => bug58444.jsp}        |    8 +-
 ...-misc.jsp => el-misc-no-quote-attribute-el.jsp} |   18 +-
 ...isc.jsp => el-misc-with-quote-attribute-el.jsp} |    4 +-
 webapps/docs/cgi-howto.xml                         |    8 +-
 webapps/docs/changelog.xml                         |  740 +++-
 webapps/docs/cluster-howto.xml                     |    4 +-
 webapps/docs/config/ajp.xml                        |   26 +-
 webapps/docs/config/automatic-deployment.xml       |    7 +-
 webapps/docs/config/cluster-channel.xml            |    3 +-
 webapps/docs/config/cluster-interceptor.xml        |   18 +-
 webapps/docs/config/cluster-manager.xml            |   71 +-
 webapps/docs/config/context.xml                    |   53 +
 webapps/docs/config/filter.xml                     |  163 +
 webapps/docs/config/host.xml                       |    2 +-
 webapps/docs/config/http.xml                       |   23 +-
 webapps/docs/config/loader.xml                     |    6 +-
 webapps/docs/config/manager.xml                    |   78 +
 webapps/docs/config/realm.xml                      |    4 +-
 webapps/docs/config/systemprops.xml                |    2 +
 webapps/docs/jasper-howto.xml                      |    5 +
 webapps/docs/jndi-resources-howto.xml              |    9 +-
 webapps/docs/manager-howto.xml                     |   70 +-
 webapps/docs/security-howto.xml                    |    4 +
 webapps/docs/windows-service-howto.xml             |  180 +-
 webapps/examples/WEB-INF/classes/async/Async0.java |    2 +-
 webapps/host-manager/WEB-INF/jsp/401.jsp           |    1 +
 webapps/host-manager/WEB-INF/jsp/403.jsp           |    1 +
 webapps/host-manager/WEB-INF/jsp/404.jsp           |    3 +-
 webapps/host-manager/index.jsp                     |    4 +-
 webapps/manager/WEB-INF/jsp/401.jsp                |    1 +
 webapps/manager/WEB-INF/jsp/403.jsp                |    1 +
 webapps/manager/WEB-INF/jsp/404.jsp                |    3 +-
 webapps/manager/WEB-INF/jsp/sessionDetail.jsp      |    2 +-
 webapps/manager/WEB-INF/jsp/sessionsList.jsp       |    2 +-
 webapps/manager/WEB-INF/web.xml                    |    1 -
 webapps/manager/index.jsp                          |    4 +-
 420 files changed, 11333 insertions(+), 8268 deletions(-)
 create mode 100644 debian/patches/0026-add-asm-to-test-classpath.patch
 create mode 100644 java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
 create mode 100644 java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
 create mode 100644 java/org/apache/catalina/loader/ParallelWebappClassLoader.java
 copy java/org/apache/catalina/loader/{WebappClassLoader.java => WebappClassLoaderBase.java} (93%)
 delete mode 100644 java/org/apache/catalina/manager/util/ReverseComparator.java
 create mode 100644 java/org/apache/naming/resources/ClasspathURLStreamHandler.java
 create mode 100644 java/org/apache/tomcat/util/compat/JreVendor.java
 create mode 100644 java/org/apache/tomcat/util/file/ConfigFileLoader.java
 create mode 100644 modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 create mode 100644 test/org/apache/catalina/core/TestApplicationHttpRequest.java
 create mode 100644 test/org/apache/catalina/filters/TestRestCsrfPreventionFilter.java
 create mode 100644 test/org/apache/catalina/filters/TestRestCsrfPreventionFilter2.java
 create mode 100644 test/org/apache/catalina/loader/TestParallelWebappClassLoader.java
 create mode 100644 test/org/apache/catalina/realm/TestJNDIRealm.java
 copy test/org/apache/catalina/session/{TestStandardSession.java => TestStandardSessionIntegration.java} (97%)
 copy test/org/apache/{catalina/loader/TestWebappClassLoader.java => jasper/runtime/TestCustomHttpJspPage.java} (72%)
 copy java/org/apache/jasper/runtime/HttpJspBase.java => test/org/apache/jasper/runtime/TesterHttpJspBase.java (58%)
 copy test/org/apache/{tomcat/util/res/TestStringManager.java => naming/resources/TestClasspathUrlStreamHandler.java} (50%)
 rename test/org/apache/{catalina/core => tomcat/unittest}/TesterContext.java (95%)
 rename test/org/apache/{catalina/connector => tomcat/unittest}/TesterRequest.java (59%)
 rename test/org/apache/{catalina/connector => tomcat/unittest}/TesterResponse.java (96%)
 rename test/org/apache/{catalina/filters => tomcat/unittest}/TesterServletContext.java (94%)
 create mode 100644 test/org/apache/tomcat/unittest/TesterSessionCookieConfig.java
 create mode 100644 test/org/apache/tomcat/util/file/TestConfigFileLoader.java
 create mode 100644 test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
 create mode 100644 test/org/apache/tomcat/websocket/server/TestClose.java
 create mode 100644 test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
 create mode 100644 test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java
 copy test/webapp-3.0/bug5nnnn/{bug58096.jsp => bug58444.jsp} (81%)
 copy test/webapp-3.0/{el-misc.jsp => el-misc-no-quote-attribute-el.jsp} (72%)
 rename test/webapp-3.0/{el-misc.jsp => el-misc-with-quote-attribute-el.jsp} (91%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git



More information about the pkg-java-commits mailing list