[tomcat7] 03/11: Merge tag 'upstream/7.0.67'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Feb 18 22:07:13 GMT 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 901e1e3fd0bc50749c594de3aa5e6e77d7f0d16d
Merge: cd15d0f 8d29698
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Dec 19 10:27:53 2015 +0100
Merge tag 'upstream/7.0.67'
Upstream version 7.0.67
BUILDING.txt | 5 +
RUNNING.txt | 8 +-
bin/catalina.bat | 4 +-
bin/catalina.sh | 2 +-
build.properties.default | 24 +-
build.xml | 22 ++
conf/web.xml | 24 +-
java/javax/el/BeanELResolver.java | 16 +-
java/javax/servlet/http/Cookie.java | 9 +-
java/org/apache/catalina/Context.java | 100 +++++
java/org/apache/catalina/Globals.java | 2 +-
java/org/apache/catalina/SessionIdGenerator.java | 1 -
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 4 +-
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 8 +-
.../authenticator/DigestAuthenticator.java | 2 +-
.../catalina/authenticator/FormAuthenticator.java | 14 +
.../catalina/authenticator/SingleSignOn.java | 3 +-
.../apache/catalina/connector/CometEventImpl.java | 3 +-
java/org/apache/catalina/connector/Connector.java | 2 +-
.../apache/catalina/connector/CoyoteAdapter.java | 5 +-
.../apache/catalina/connector/MapperListener.java | 3 +-
java/org/apache/catalina/connector/Request.java | 103 +++--
java/org/apache/catalina/connector/Response.java | 22 +-
.../apache/catalina/core/ApplicationContext.java | 5 +-
.../catalina/core/ApplicationDispatcher.java | 3 +-
.../catalina/core/ApplicationHttpRequest.java | 14 +-
.../core/JreMemoryLeakPreventionListener.java | 27 +-
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 92 ++++-
.../apache/catalina/core/StandardHostValve.java | 14 +-
.../apache/catalina/core/StandardWrapperValve.java | 4 +-
.../apache/catalina/core/mbeans-descriptors.xml | 12 +
java/org/apache/catalina/filters/Constants.java | 9 +
.../catalina/filters/CsrfPreventionFilter.java | 125 +-----
.../catalina/filters/CsrfPreventionFilterBase.java | 140 +++++++
.../catalina/filters/LocalStrings.properties | 2 +-
.../apache/catalina/filters/RemoteIpFilter.java | 73 +---
.../catalina/filters/RequestDumperFilter.java | 6 +-
.../catalina/filters/RestCsrfPreventionFilter.java | 251 ++++++++++++
java/org/apache/catalina/ha/ClusterRuleSet.java | 9 +-
.../apache/catalina/ha/session/DeltaManager.java | 109 +++---
.../apache/catalina/ha/session/DeltaSession.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/loader/WebappClassLoaderBase.java | 6 +-
.../catalina/manager/HTMLManagerServlet.java | 3 +-
.../apache/catalina/manager/ManagerServlet.java | 3 +-
.../apache/catalina/manager/StatusTransformer.java | 4 +-
.../catalina/manager/util/ReverseComparator.java | 47 ---
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 +
java/org/apache/catalina/realm/JNDIRealm.java | 31 +-
java/org/apache/catalina/realm/MemoryRealm.java | 59 +--
java/org/apache/catalina/realm/RealmBase.java | 4 +-
java/org/apache/catalina/servlets/CGIServlet.java | 63 ++-
.../apache/catalina/servlets/DefaultServlet.java | 74 ++--
.../apache/catalina/servlets/WebdavServlet.java | 68 ++--
java/org/apache/catalina/session/FileStore.java | 10 +-
java/org/apache/catalina/session/JDBCStore.java | 181 +++++----
.../catalina/session/PersistentManagerBase.java | 72 ++--
.../apache/catalina/session/StandardManager.java | 2 +-
.../apache/catalina/session/StandardSession.java | 6 +-
java/org/apache/catalina/session/StoreBase.java | 37 +-
java/org/apache/catalina/startup/Catalina.java | 118 +++---
.../catalina/startup/ClassLoaderFactory.java | 6 +
.../org/apache/catalina/startup/ContextConfig.java | 77 ++--
.../org/apache/catalina/startup/FailedContext.java | 29 ++
.../apache/catalina/startup/HomesUserDatabase.java | 7 +-
java/org/apache/catalina/startup/HostConfig.java | 7 +-
.../catalina/startup/LocalStrings.properties | 4 +-
java/org/apache/catalina/startup/Tomcat.java | 18 +-
.../catalina/startup/WebappServiceLoader.java | 6 +-
.../interceptors/StaticMembershipInterceptor.java | 29 +-
.../group/interceptors/TcpFailureDetector.java | 60 +--
.../catalina/tribes/membership/McastService.java | 18 +-
.../tribes/tipis/AbstractReplicatedMap.java | 16 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../catalina/tribes/transport/bio/BioSender.java | 16 +-
.../apache/catalina/users/MemoryUserDatabase.java | 69 ++--
.../catalina/users/MemoryUserDatabaseFactory.java | 2 +-
.../apache/catalina/util/ExtensionValidator.java | 3 +
.../catalina/util/StandardSessionIdGenerator.java | 1 -
.../catalina/valves/ExtendedAccessLogValve.java | 16 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 2 +-
java/org/apache/catalina/websocket/WsOutbound.java | 4 +-
java/org/apache/coyote/Constants.java | 4 +-
java/org/apache/coyote/Request.java | 9 +-
.../coyote/http11/AbstractHttp11Processor.java | 8 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 2 -
.../coyote/http11/filters/ChunkedInputFilter.java | 4 -
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/util/Validation.java | 19 +-
java/org/apache/jasper/Constants.java | 2 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 28 ++
java/org/apache/jasper/JspC.java | 56 ++-
java/org/apache/jasper/Options.java | 6 +
.../apache/jasper/compiler/AttributeParser.java | 35 +-
java/org/apache/jasper/compiler/Generator.java | 4 +-
.../jasper/compiler/ImplicitTagLibraryInfo.java | 2 +-
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 | 12 +-
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 4 +-
.../apache/jasper/compiler/TagFileProcessor.java | 13 +-
.../jasper/resources/LocalStrings.properties | 1 +
.../org/apache/jasper/runtime/BodyContentImpl.java | 2 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 4 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 18 +-
.../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 +-
java/org/apache/juli/ClassLoaderLogManager.java | 2 +-
java/org/apache/juli/JdkLoggerFormatter.java | 6 +-
java/org/apache/naming/factory/BeanFactory.java | 12 +-
.../resources/ClasspathURLStreamHandler.java | 50 +++
.../DirContextURLStreamHandlerFactory.java | 7 +-
.../apache/naming/resources/EmptyDirContext.java | 4 +-
.../naming/resources/LocalStrings.properties | 1 +
.../org/apache/naming/resources/WARDirContext.java | 13 +-
java/org/apache/tomcat/jni/Library.java | 11 +-
java/org/apache/tomcat/jni/Socket.java | 6 +-
.../org/apache/tomcat/util/IntrospectionUtils.java | 10 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 2 +-
.../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 +-
.../tomcat/util/http/FastHttpDateFormat.java | 4 +-
.../org/apache/tomcat/util/http/mapper/Mapper.java | 63 ++-
java/org/apache/tomcat/util/modeler/Registry.java | 6 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 26 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 27 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 6 +-
.../apache/tomcat/util/net/NioSelectorPool.java | 2 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 9 +-
.../apache/tomcat/util/net/SocketProperties.java | 2 +-
java/org/apache/tomcat/util/net/URL.java | 6 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 17 +-
.../websocket/AsyncChannelWrapperSecure.java | 4 +-
.../tomcat/websocket/LocalStrings.properties | 6 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
java/org/apache/tomcat/websocket/WsSession.java | 33 +-
.../tomcat/websocket/WsWebSocketContainer.java | 253 +++++++++---
.../tomcat/websocket/pojo/PojoMethodMapping.java | 9 +-
.../apache/tomcat/websocket/server/Constants.java | 4 +
.../websocket/server/WsHandshakeRequest.java | 6 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +
modules/jdbc-pool/doc/jdbc-pool.xml | 1 +
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 2 +-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 14 +-
.../apache/tomcat/jdbc/pool/PoolProperties.java | 8 +-
.../apache/tomcat/jdbc/pool/PooledConnection.java | 2 +-
.../jdbc/pool/interceptor/SlowQueryReport.java | 35 +-
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 1 -
.../tomcat/jdbc/test/TestSlowQueryComparator.java | 123 ++++++
res/checkstyle/org-import-control.xml | 1 +
res/findbugs/filter-false-positives.xml | 42 +-
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 | 1 +
.../apache/catalina/connector/TestResponse.java | 213 ++++++++++
.../connector/TestResponsePerformance.java | 12 +-
.../catalina/core/TestStandardHostValve.java | 3 +-
.../catalina/filters/TestRemoteIpFilter.java | 97 +----
.../filters/TestRestCsrfPreventionFilter.java | 429 +++++++++++++++++++++
.../filters/TestRestCsrfPreventionFilter2.java | 371 ++++++++++++++++++
.../catalina/filters/TesterFilterConfigs.java | 2 +
test/org/apache/catalina/realm/TestJNDIRealm.java | 166 ++++++++
test/org/apache/catalina/realm/TestRealmBase.java | 8 +-
.../catalina/startup/TestWebappServiceLoader.java | 1 -
.../apache/catalina/startup/TomcatBaseTest.java | 3 +-
.../catalina/tribes/demos/ChannelCreator.java | 2 +-
.../apache/catalina/websocket/TestWebSocket.java | 2 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 2 +-
test/org/apache/el/TestELInJsp.java | 40 +-
.../jasper/compiler/TestAttributeParser.java | 4 +-
.../resources/TestClasspathUrlStreamHandler.java | 51 +++
.../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 ++++
.../tomcat/util/http/mapper/TestMapperWebapps.java | 64 +++
.../websocket/TestWebSocketFrameClientSSL.java | 3 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 24 +-
.../TestWsWebSocketContainerWithProxy.java | 51 +++
.../tomcat/websocket/TesterWsClientAutobahn.java | 2 +-
.../websocket/pojo/TestPojoMethodMapping.java | 4 +-
.../server/TestWsRemoteEndpointImplServer.java | 175 +++++++++
.../websocket/server/TestWsServerContainer.java | 2 +-
test/webapp-3.0/bug45nnn/bug45427.jsp | 12 +-
test/webapp-3.0/bug45nnn/bug45451.jspf | 8 +-
test/webapp-3.0/bug45nnn/bug45451a.jsp | 4 +-
test/webapp-3.0/el-method.jsp | 4 +-
...-misc.jsp => el-misc-no-quote-attribute-el.jsp} | 0
...isc.jsp => el-misc-with-quote-attribute-el.jsp} | 18 +-
webapps/docs/cgi-howto.xml | 8 +-
webapps/docs/changelog.xml | 328 +++++++++++++++-
webapps/docs/config/ajp.xml | 6 +-
webapps/docs/config/cluster-channel.xml | 3 +-
webapps/docs/config/cluster-interceptor.xml | 18 +-
webapps/docs/config/context.xml | 53 +++
webapps/docs/config/filter.xml | 155 ++++++++
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 15 +-
webapps/docs/config/realm.xml | 4 +-
webapps/docs/config/systemprops.xml | 2 +
webapps/docs/jasper-howto.xml | 5 +
webapps/docs/jndi-resources-howto.xml | 5 +-
webapps/docs/security-howto.xml | 4 +
webapps/docs/windows-service-howto.xml | 180 ++++-----
webapps/examples/WEB-INF/classes/async/Async0.java | 2 +-
227 files changed, 5152 insertions(+), 1553 deletions(-)
--
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