[tomcat8] branch master updated (d00ec10 -> abe35af)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Dec 18 11:38:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat8.
from d00ec10 Upload to unstable
adds a57552e Imported Upstream version 8.0.30
new b1f2c2e Merge tag 'upstream/8.0.30'
new fa04b4e Refreshed the patches
new afd9681 Use LC_ALL instead of LANG to format the date and make the documentation reproducible on the builders
new abe35af Upload to unstable
The 4 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 | 17 +
RUNNING.txt | 8 +-
bin/catalina.bat | 4 +-
bin/catalina.sh | 2 +-
build.properties.default | 19 +-
build.xml | 44 ++-
conf/web.xml | 41 +-
debian/changelog | 10 +
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
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 | 2 +-
debian/rules | 2 +-
java/javax/el/BeanELResolver.java | 16 +-
java/javax/servlet/ServletRequest.java | 9 +-
java/javax/servlet/ServletRequestWrapper.java | 16 +-
java/org/apache/catalina/Context.java | 142 +++++--
java/org/apache/catalina/Globals.java | 2 +-
java/org/apache/catalina/Loader.java | 11 +-
java/org/apache/catalina/Pipeline.java | 8 +-
java/org/apache/catalina/Realm.java | 61 +--
java/org/apache/catalina/Role.java | 6 +-
java/org/apache/catalina/Server.java | 32 +-
java/org/apache/catalina/Service.java | 30 +-
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 +
.../apache/catalina/connector/CometEventImpl.java | 3 +-
java/org/apache/catalina/connector/Connector.java | 2 +-
.../apache/catalina/connector/CoyoteAdapter.java | 31 +-
.../org/apache/catalina/connector/InputBuffer.java | 12 +-
.../catalina/connector/LocalStrings.properties | 1 +
java/org/apache/catalina/connector/Request.java | 107 ++++--
java/org/apache/catalina/connector/Response.java | 27 +-
.../apache/catalina/core/ApplicationContext.java | 18 +-
.../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 | 84 ++++-
.../apache/catalina/core/StandardHostValve.java | 14 +-
java/org/apache/catalina/core/StandardService.java | 17 +-
.../apache/catalina/core/StandardWrapperValve.java | 9 +-
.../core/ThreadLocalLeakPreventionListener.java | 1 +
.../apache/catalina/core/mbeans-descriptors.xml | 12 +
java/org/apache/catalina/filters/Constants.java | 9 +
.../catalina/filters/CsrfPreventionFilter.java | 125 +-----
.../catalina/filters/CsrfPreventionFilterBase.java | 132 +++++++
.../catalina/filters/LocalStrings.properties | 2 +-
.../apache/catalina/filters/RemoteIpFilter.java | 73 +---
.../catalina/filters/RequestDumperFilter.java | 6 +-
.../catalina/filters/RestCsrfPreventionFilter.java | 238 ++++++++++++
java/org/apache/catalina/ha/ClusterRuleSet.java | 7 +
.../apache/catalina/ha/session/DeltaManager.java | 112 +++---
.../apache/catalina/ha/session/DeltaSession.java | 2 +-
.../catalina/ha/session/JvmRouteBinderValve.java | 2 +-
.../catalina/loader/WebappClassLoaderBase.java | 8 +-
.../catalina/manager/HTMLManagerServlet.java | 3 +-
.../apache/catalina/manager/StatusTransformer.java | 4 +-
.../catalina/manager/util/ReverseComparator.java | 47 ---
java/org/apache/catalina/mapper/Mapper.java | 31 +-
.../org/apache/catalina/mapper/MapperListener.java | 15 +-
java/org/apache/catalina/mbeans/MBeanDumper.java | 6 +-
java/org/apache/catalina/mbeans/MBeanFactory.java | 9 +-
java/org/apache/catalina/mbeans/MBeanUtils.java | 30 +-
java/org/apache/catalina/realm/CombinedRealm.java | 11 +
.../apache/catalina/realm/GenericPrincipal.java | 4 +-
java/org/apache/catalina/realm/JDBCRealm.java | 12 +-
java/org/apache/catalina/realm/JNDIRealm.java | 31 +-
java/org/apache/catalina/realm/RealmBase.java | 14 +-
java/org/apache/catalina/servlets/CGIServlet.java | 18 +-
.../apache/catalina/servlets/DefaultServlet.java | 74 ++--
.../apache/catalina/servlets/WebdavServlet.java | 66 ++--
java/org/apache/catalina/session/FileStore.java | 10 +-
java/org/apache/catalina/session/JDBCStore.java | 165 ++++----
.../catalina/session/PersistentManagerBase.java | 68 ++--
.../apache/catalina/session/StandardManager.java | 2 +-
.../apache/catalina/session/StandardSession.java | 6 +-
java/org/apache/catalina/session/StoreBase.java | 33 +-
.../catalina/ssi/SSIServletExternalResolver.java | 6 +-
.../catalina/startup/ClassLoaderFactory.java | 6 +
.../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 | 3 +-
.../group/interceptors/LocalStrings.properties | 4 +-
.../interceptors/StaticMembershipInterceptor.java | 28 +-
.../group/interceptors/TcpFailureDetector.java | 60 +--
.../catalina/tribes/membership/McastService.java | 18 +-
.../catalina/tribes/membership/Membership.java | 2 +-
.../tribes/tipis/AbstractReplicatedMap.java | 14 +-
.../catalina/tribes/tipis/LocalStrings.properties | 2 +
.../catalina/tribes/tipis/ReplicatedMap.java | 2 +-
.../catalina/tribes/transport/bio/BioSender.java | 16 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 2 +-
.../apache/catalina/util/ExtensionValidator.java | 3 +
.../catalina/util/StandardSessionIdGenerator.java | 1 -
.../catalina/valves/ExtendedAccessLogValve.java | 18 +-
.../apache/catalina/valves/JDBCAccessLogValve.java | 2 +-
.../catalina/valves/rewrite/RewriteValve.java | 3 +-
.../apache/catalina/webresources/FileResource.java | 2 +-
.../TomcatURLStreamHandlerFactory.java | 17 +-
java/org/apache/coyote/AbstractProcessor.java | 4 +-
java/org/apache/coyote/AbstractProtocol.java | 35 +-
java/org/apache/coyote/ActionCode.java | 5 +
java/org/apache/coyote/Constants.java | 4 +-
java/org/apache/coyote/Processor.java | 4 +-
java/org/apache/coyote/Request.java | 7 +
java/org/apache/coyote/UpgradeToken.java | 53 +++
.../apache/coyote/ajp/AbstractAjpProcessor.java | 10 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 5 +-
.../coyote/http11/AbstractHttp11Processor.java | 31 +-
.../apache/coyote/http11/AbstractInputBuffer.java | 6 +-
.../apache/coyote/http11/Http11AprProtocol.java | 7 +-
.../apache/coyote/http11/Http11Nio2Protocol.java | 7 +-
.../apache/coyote/http11/Http11NioProtocol.java | 7 +-
java/org/apache/coyote/http11/Http11Protocol.java | 7 +-
.../apache/coyote/http11/InternalInputBuffer.java | 2 +-
.../coyote/http11/InternalNio2InputBuffer.java | 9 +-
.../coyote/http11/InternalNio2OutputBuffer.java | 11 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 4 -
.../coyote/http11/upgrade/AbstractProcessor.java | 12 +-
.../apache/coyote/http11/upgrade/AprProcessor.java | 7 +-
.../apache/coyote/http11/upgrade/BioProcessor.java | 7 +-
.../coyote/http11/upgrade/Nio2Processor.java | 7 +-
.../http11/upgrade/Nio2ServletInputStream.java | 9 +-
.../http11/upgrade/Nio2ServletOutputStream.java | 15 +-
.../apache/coyote/http11/upgrade/NioProcessor.java | 7 +-
java/org/apache/el/lang/ELArithmetic.java | 16 +-
java/org/apache/el/lang/ELSupport.java | 23 +-
java/org/apache/el/lang/ExpressionBuilder.java | 16 +-
java/org/apache/el/util/Validation.java | 19 +-
java/org/apache/jasper/Constants.java | 2 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 61 +++
java/org/apache/jasper/JspC.java | 81 +++-
java/org/apache/jasper/Options.java | 12 +
.../apache/jasper/compiler/AttributeParser.java | 59 ++-
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 | 13 +-
.../apache/jasper/compiler/ParserController.java | 2 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 4 +-
.../apache/jasper/compiler/TagFileProcessor.java | 13 +-
.../jasper/resources/LocalStrings.properties | 2 +
.../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/servlet/TldScanner.java | 5 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 6 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 2 +-
java/org/apache/juli/ClassLoaderLogManager.java | 2 +-
java/org/apache/juli/JdkLoggerFormatter.java | 4 +-
java/org/apache/naming/factory/BeanFactory.java | 12 +-
java/org/apache/tomcat/ContextBind.java | 61 +++
java/org/apache/tomcat/jni/Library.java | 13 +-
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/file/ConfigFileLoader.java | 35 +-
.../org/apache/tomcat/util/http/CookieSupport.java | 22 +-
.../tomcat/util/http/FastHttpDateFormat.java | 4 +-
.../apache/tomcat/util/http/SetCookieSupport.java | 2 +-
java/org/apache/tomcat/util/modeler/Registry.java | 6 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 3 -
java/org/apache/tomcat/util/net/AprEndpoint.java | 23 +-
java/org/apache/tomcat/util/net/Constants.java | 2 +
.../apache/tomcat/util/net/NioSelectorPool.java | 2 +-
.../apache/tomcat/util/net/SecureNio2Channel.java | 22 +-
.../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 | 3 -
.../tomcat/util/net/jsse/openssl/Cipher.java | 168 ++++-----
.../openssl/OpenSSLCipherConfigurationParser.java | 6 +-
.../tomcat/util/net/jsse/openssl/Protocol.java | 2 +-
.../websocket/AsyncChannelWrapperSecure.java | 4 +-
.../tomcat/websocket/LocalStrings.properties | 6 +-
java/org/apache/tomcat/websocket/WsFrameBase.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 +-
.../websocket/server/WsHttpUpgradeHandler.java | 22 +-
.../tomcat/websocket/server/WsServerContainer.java | 2 +
modules/jdbc-pool/doc/jdbc-pool.xml | 1 +
.../apache/tomcat/jdbc/pool/ClassLoaderUtil.java | 2 +-
.../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 | 34 +-
.../jdbc/pool/interceptor/SlowQueryReportJmx.java | 1 -
.../tomcat/jdbc/test/TestSlowQueryComparator.java | 123 ++++++
res/checkstyle/org-import-control.xml | 2 +
res/findbugs/filter-false-positives.xml | 87 ++++-
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 | 1 +
.../apache/catalina/connector/TestSendFile.java | 2 +-
.../catalina/core/TestStandardHostValve.java | 3 +-
.../catalina/filters/TestRemoteIpFilter.java | 97 +----
.../filters/TestRestCsrfPreventionFilter.java | 353 +++++++++++++++++
.../filters/TestRestCsrfPreventionFilter2.java | 372 ++++++++++++++++++
.../catalina/filters/TesterFilterConfigs.java | 2 +
.../apache/catalina/mapper/TestMapperWebapps.java | 64 ++++
test/org/apache/catalina/realm/TestJNDIRealm.java | 174 +++++++++
test/org/apache/catalina/realm/TestRealmBase.java | 8 +-
.../catalina/startup/TestWebappServiceLoader.java | 2 +-
.../apache/catalina/startup/TomcatBaseTest.java | 6 +-
.../catalina/tribes/demos/ChannelCreator.java | 2 +-
.../catalina/valves/rewrite/TestRewriteValve.java | 3 +
...java => TestTomcatURLStreamHandlerFactory.java} | 33 +-
.../webresources/TesterWebResourceRoot.java | 2 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 2 +-
test/org/apache/el/TestELInJsp.java | 46 ++-
.../jasper/compiler/TestAttributeParser.java | 4 +-
.../core => tomcat/unittest}/TesterContext.java | 37 +-
.../unittest}/TesterRequest.java | 61 ++-
.../unittest}/TesterResponse.java | 4 +-
.../unittest}/TesterServletContext.java | 16 +-
.../tomcat/unittest/TesterSessionCookieConfig.java | 93 +++++
.../apache/tomcat/util/bcel/TesterPerformance.java | 3 +
.../tomcat/util/net/jsse/openssl/TestCipher.java | 65 ++--
.../tomcat/util/scan/TestStandardJarScanner.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 24 +-
.../TestWsWebSocketContainerWithProxy.java | 51 +++
.../tomcat/websocket/TesterWsClientAutobahn.java | 2 +-
.../websocket/pojo/TestPojoMethodMapping.java | 4 +-
.../server/TestWsRemoteEndpointImplServer.java | 176 +++++++++
.../websocket/server/TestWsServerContainer.java | 2 +-
test/webapp/bug45nnn/bug45427.jsp | 12 +-
test/webapp/bug45nnn/bug45451.jspf | 8 +-
test/webapp/bug45nnn/bug45451a.jsp | 4 +-
test/webapp/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 | 5 +-
webapps/docs/changelog.xml | 418 ++++++++++++++++++++-
webapps/docs/config/ajp.xml | 6 +-
webapps/docs/config/cluster-interceptor.xml | 18 +-
webapps/docs/config/context.xml | 53 +++
webapps/docs/config/cookie-processor.xml | 25 +-
webapps/docs/config/filter.xml | 155 ++++++++
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 6 +-
webapps/docs/config/systemprops.xml | 7 +-
webapps/docs/jasper-howto.xml | 13 +-
webapps/docs/security-howto.xml | 4 +
webapps/docs/windows-service-howto.xml | 18 +-
webapps/examples/WEB-INF/classes/async/Async0.java | 2 +-
269 files changed, 5281 insertions(+), 1736 deletions(-)
create mode 100644 java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
create mode 100644 java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
delete mode 100644 java/org/apache/catalina/manager/util/ReverseComparator.java
create mode 100644 java/org/apache/coyote/UpgradeToken.java
create mode 100644 java/org/apache/tomcat/ContextBind.java
create mode 100644 modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.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/realm/TestJNDIRealm.java
copy test/org/apache/catalina/webresources/{TestWarURLStreamHandler.java => TestTomcatURLStreamHandlerFactory.java} (61%)
rename test/org/apache/{catalina/core => tomcat/unittest}/TesterContext.java (95%)
rename test/org/apache/{catalina/connector => tomcat/unittest}/TesterRequest.java (63%)
rename test/org/apache/{catalina/connector => tomcat/unittest}/TesterResponse.java (96%)
rename test/org/apache/{catalina/filters => tomcat/unittest}/TesterServletContext.java (95%)
create mode 100644 test/org/apache/tomcat/unittest/TesterSessionCookieConfig.java
create mode 100644 test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
create mode 100644 test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
copy test/webapp/{el-misc.jsp => el-misc-no-quote-attribute-el.jsp} (100%)
rename test/webapp/{el-misc.jsp => el-misc-with-quote-attribute-el.jsp} (75%)
--
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