This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit a6a8465e98ea709df577b2a970433eb97d2963d2
Merge: cf00093 28c56ce
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Sep 19 09:20:16 2016 +0200
Merge tag 'upstream/8.0.37'
Upstream version 8.0.37
SVN-MERGE.txt => MERGE.txt | 37 +-
build.properties.default | 10 +-
conf/web.xml | 36 +-
java/javax/persistence/PersistenceContext.java | 3 +-
.../javax/persistence/SynchronizationType.java | 18 +-
java/org/apache/catalina/Context.java | 58 ++-
.../catalina/authenticator/mbeans-descriptors.xml | 2 +-
.../apache/catalina/connector/CoyoteAdapter.java | 2 +-
.../org/apache/catalina/connector/InputBuffer.java | 2 +-
java/org/apache/catalina/connector/Request.java | 17 +-
.../catalina/connector/mbeans-descriptors.xml | 4 +-
.../apache/catalina/core/ApplicationContext.java | 24 +-
.../catalina/core/ApplicationFilterConfig.java | 3 +-
.../core/ApplicationFilterRegistration.java | 1 +
.../core/ApplicationServletRegistration.java | 4 +-
.../apache/catalina/core/AprLifecycleListener.java | 4 +-
.../core/JreMemoryLeakPreventionListener.java | 22 +-
.../apache/catalina/core/LocalStrings.properties | 2 +
.../catalina/core/NamingContextListener.java | 19 +
java/org/apache/catalina/core/StandardContext.java | 87 ++--
java/org/apache/catalina/core/StandardWrapper.java | 51 +-
.../apache/catalina/core/mbeans-descriptors.xml | 8 +-
java/org/apache/catalina/filters/CorsFilter.java | 8 +-
.../catalina/filters/LocalStrings.properties | 2 +
.../org/apache/catalina/filters/RequestFilter.java | 5 +
.../ha/authenticator/mbeans-descriptors.xml | 2 +-
.../catalina/ha/session/mbeans-descriptors.xml | 10 +-
.../apache/catalina/ha/tcp/mbeans-descriptors.xml | 2 +-
.../catalina/loader/WebappClassLoaderBase.java | 21 +-
.../catalina/manager/HTMLManagerServlet.java | 10 +-
.../apache/catalina/mbeans/mbeans-descriptors.xml | 2 +-
.../org/apache/catalina/realm/DataSourceRealm.java | 36 +-
java/org/apache/catalina/realm/JDBCRealm.java | 11 +-
java/org/apache/catalina/realm/JNDIRealm.java | 56 ++-
java/org/apache/catalina/realm/LockOutRealm.java | 94 ++--
java/org/apache/catalina/realm/MemoryRealm.java | 33 +-
java/org/apache/catalina/realm/RealmBase.java | 65 ++-
.../apache/catalina/realm/mbeans-descriptors.xml | 2 +-
java/org/apache/catalina/servlets/CGIServlet.java | 549 +++++++++------------
.../apache/catalina/servlets/DefaultServlet.java | 2 +-
.../catalina/servlets/LocalStrings.properties | 19 +
.../apache/catalina/servlets/WebdavServlet.java | 15 +-
.../apache/catalina/session/mbeans-descriptors.xml | 6 +-
java/org/apache/catalina/ssi/SSIMediator.java | 2 +-
.../org/apache/catalina/startup/ContextConfig.java | 19 +-
.../org/apache/catalina/startup/FailedContext.java | 10 +
java/org/apache/catalina/startup/Tomcat.java | 6 +-
.../apache/catalina/tribes/group/RpcChannel.java | 15 +-
.../interceptors/MessageDispatch15Interceptor.java | 2 +-
.../tribes/membership/mbeans-descriptors.xml | 2 +-
.../tribes/tipis/AbstractReplicatedMap.java | 4 +-
.../catalina/tribes/tipis/LocalStrings.properties | 1 +
java/org/apache/catalina/tribes/util/Arrays.java | 3 -
java/org/apache/catalina/util/LifecycleBase.java | 72 ++-
java/org/apache/catalina/util/URLEncoder.java | 28 +-
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/RemoteAddrValve.java | 27 +-
.../apache/catalina/valves/RemoteHostValve.java | 28 +-
.../apache/catalina/valves/RequestFilterValve.java | 10 +-
.../apache/catalina/valves/mbeans-descriptors.xml | 2 +-
.../catalina/valves/rewrite/ResolverImpl.java | 7 +-
.../catalina/valves/rewrite/RewriteValve.java | 43 +-
.../apache/catalina/webresources/StandardRoot.java | 4 +
.../catalina/webresources/mbeans-descriptors.xml | 2 +-
java/org/apache/coyote/AbstractProcessor.java | 12 +
java/org/apache/coyote/AbstractProtocol.java | 24 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 1 +
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 1 +
.../coyote/http11/AbstractHttp11Processor.java | 1 +
.../coyote/http11/AbstractHttp11Protocol.java | 1 +
.../coyote/http11/InternalNio2OutputBuffer.java | 90 ++--
java/org/apache/el/parser/AstFunction.java | 2 +
java/org/apache/jasper/EmbeddedServletOptions.java | 4 +
java/org/apache/jasper/JspCompilationContext.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 32 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 2 +-
java/org/apache/jasper/compiler/Localizer.java | 2 +-
.../jasper/resources/LocalStrings.properties | 2 +
.../jasper/{util => runtime}/ExceptionUtils.java | 2 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 60 +--
java/org/apache/jasper/runtime/TagHandlerPool.java | 40 +-
.../apache/jasper/servlet/JspCServletContext.java | 2 +-
java/org/apache/jasper/servlet/JspServlet.java | 26 +-
.../apache/jasper/servlet/JspServletWrapper.java | 9 +-
.../org/apache/naming/ContextAccessController.java | 16 +-
java/org/apache/naming/NamingContext.java | 12 +-
.../apache/naming/factory/ResourceLinkFactory.java | 97 +++-
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 3 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 6 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 4 +-
.../dbcp2/datasources/SharedPoolDataSource.java | 4 +-
java/org/apache/tomcat/util/bcel/Const.java | 132 +++++
java/org/apache/tomcat/util/bcel/Constants.java | 97 ----
.../bcel/classfile/AnnotationElementValue.java | 4 +-
.../util/bcel/classfile/AnnotationEntry.java | 15 +-
.../tomcat/util/bcel/classfile/Annotations.java | 9 +-
.../util/bcel/classfile/ArrayElementValue.java | 4 +-
.../util/bcel/classfile/ClassElementValue.java | 8 +-
.../util/bcel/classfile/ClassFormatException.java | 4 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 28 +-
.../tomcat/util/bcel/classfile/Constant.java | 37 +-
.../tomcat/util/bcel/classfile/ConstantClass.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantFloat.java | 10 +-
.../util/bcel/classfile/ConstantInteger.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 17 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 9 +-
.../tomcat/util/bcel/classfile/ElementValue.java | 26 +-
.../util/bcel/classfile/ElementValuePair.java | 9 +-
.../util/bcel/classfile/EnumElementValue.java | 8 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 8 +-
.../util/bcel/classfile/SimpleElementValue.java | 48 +-
.../apache/tomcat/util/bcel/classfile/Utility.java | 18 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 6 +-
.../tomcat/util/descriptor/InputSourceUtil.java | 31 +-
.../tomcat/util/descriptor/web/ErrorPage.java | 3 +-
.../tomcat/util/descriptor/web/FilterMap.java | 5 +-
.../util/descriptor/web/JspPropertyGroup.java | 8 +-
.../util/descriptor/web/SecurityCollection.java | 23 +-
.../util/descriptor/web/SecurityConstraint.java | 9 +-
.../apache/tomcat/util/descriptor/web/WebXml.java | 36 +-
.../tomcat/util/descriptor/web/WebXmlParser.java | 13 +-
.../util/descriptor/web/XmlEncodingBase.java | 30 +-
java/org/apache/tomcat/util/digester/Digester.java | 15 +
.../tomcat/util/digester/DocumentProperties.java | 26 +-
.../tomcat/util/http/LegacyCookieProcessor.java | 2 +-
.../tomcat/util/http/LocalStrings.properties | 3 +-
.../org/apache/tomcat/util/http/ServerCookies.java | 24 +-
.../util/http/fileupload/MultipartStream.java | 59 ++-
.../http/fileupload/util/LimitedInputStream.java | 10 +-
.../util/mime/QuotedPrintableDecoder.java | 3 +-
.../org/apache/tomcat/util/http/parser/Cookie.java | 2 +-
.../apache/tomcat/util/net/SocketProperties.java | 4 +-
.../tomcat/util/net/jsse/openssl/Cipher.java | 38 +-
.../openssl/OpenSSLCipherConfigurationParser.java | 5 +-
.../tomcat/util/net/jsse/openssl/Protocol.java | 2 +-
.../tomcat/util/scan/StandardJarScanner.java | 3 +-
.../tomcat/util/security/PermissionCheck.java | 43 ++
.../tomcat/websocket/FutureToSendHandler.java | 8 +-
.../tomcat/websocket/LocalStrings.properties | 2 +
java/org/apache/tomcat/websocket/WsSession.java | 22 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 16 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 33 +-
.../apache/tomcat/jdbc/pool/PoolProperties.java | 2 +-
.../jdbc/pool/interceptor/StatementCache.java | 6 +
.../interceptor/StatementDecoratorInterceptor.java | 17 +-
res/checkstyle/checkstyle.xml | 7 +-
res/checkstyle/javax-checkstyle.xml | 8 +-
res/checkstyle/org-checkstyle.xml | 8 +-
res/maven/mvn.properties.default | 2 +-
test/javax/el/TestImportHandler.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 6 +-
.../authenticator/TestDigestAuthenticator.java | 4 +-
.../authenticator/TestFormAuthenticator.java | 6 +-
.../TestNonLoginAndBasicAuthenticator.java | 16 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 16 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 12 +-
.../apache/catalina/comet/TestCometProcessor.java | 16 +-
.../apache/catalina/connector/TestConnector.java | 2 +-
.../catalina/connector/TestCoyoteAdapter.java | 10 +-
.../catalina/connector/TestCoyoteOutputStream.java | 4 +-
.../apache/catalina/connector/TestInputBuffer.java | 2 +-
.../catalina/connector/TestKeepAliveCount.java | 2 +-
.../catalina/connector/TestMaxConnections.java | 2 +-
.../catalina/connector/TestOutputBuffer.java | 4 +-
.../org/apache/catalina/connector/TestRequest.java | 18 +-
.../apache/catalina/connector/TestResponse.java | 6 +-
.../apache/catalina/connector/TestSendFile.java | 2 +-
.../catalina/core/TestApplicationContext.java | 2 +-
...TestApplicationContextGetRequestDispatcher.java | 503 +++++++++++++++++++
.../catalina/core/TestApplicationFilterConfig.java | 2 +-
.../catalina/core/TestApplicationHttpRequest.java | 8 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 90 ++--
.../apache/catalina/core/TestStandardContext.java | 8 +-
.../catalina/core/TestStandardContextAliases.java | 2 +-
.../core/TestStandardContextResources.java | 6 +-
.../catalina/core/TestStandardContextValve.java | 6 +-
.../catalina/core/TestStandardHostValve.java | 22 +-
.../apache/catalina/core/TestStandardWrapper.java | 6 +-
.../catalina/core/TestSwallowAbortedUploads.java | 4 +-
.../catalina/filters/TestAddCharSetFilter.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 6 +-
.../catalina/filters/TestRemoteIpFilter.java | 6 +-
.../filters/TestRestCsrfPreventionFilter2.java | 6 +-
.../catalina/ha/context/TestReplicatedContext.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 2 +-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 4 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 6 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 8 +-
.../org/apache/catalina/realm/TestMemoryRealm.java | 1 +
test/org/apache/catalina/realm/TestRealmBase.java | 2 +-
.../catalina/servlets/TestDefaultServlet.java | 8 +-
.../catalina/servlets/TestWebdavServlet.java | 4 +-
.../session/TestPersistentManagerIntegration.java | 6 +-
.../session/TestStandardSessionIntegration.java | 2 +-
.../apache/catalina/startup/TestContextConfig.java | 4 +-
.../startup/TestContextConfigAnnotation.java | 8 +-
test/org/apache/catalina/startup/TestTomcat.java | 13 +-
.../catalina/startup/TestTomcatClassLoader.java | 4 +-
.../apache/catalina/startup/TomcatBaseTest.java | 5 +-
.../catalina/valves/TestErrorReportValve.java | 10 +-
.../catalina/valves/rewrite/TestRewriteValve.java | 60 ++-
.../coyote/ajp/TestAbstractAjpProcessor.java | 12 +-
.../coyote/http11/TestAbstractHttp11Processor.java | 20 +-
.../coyote/http11/TestInternalInputBuffer.java | 10 +-
.../http11/filters/TestChunkedInputFilter.java | 10 +-
.../apache/coyote/http11/upgrade/TestUpgrade.java | 2 +-
test/org/apache/el/TestELInJsp.java | 10 +
test/org/apache/el/TesterFunctions.java | 12 +
.../apache/jasper/runtime/TestPageContextImpl.java | 2 +-
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
test/org/apache/naming/TestNamingContext.java | 104 ++++
.../apache/naming/resources/TestNamingContext.java | 10 +-
test/org/apache/tomcat/unittest/TesterContext.java | 18 +
.../web/TestJspPropertyGroupDescriptorImpl.java | 2 +-
.../descriptor/web/TestSecurityConstraint.java | 8 +-
.../tomcat/util/descriptor/web/TestWebXml.java | 4 +-
.../apache/tomcat/util/http/CookiesBaseTest.java | 14 +-
test/org/apache/tomcat/util/http/TestBug49158.java | 2 +-
.../apache/tomcat/util/http/TestCookieParsing.java | 27 +-
.../http/TestCookieProcessorGenerationHttp.java | 2 +-
.../util/http/TestLegacyCookieProcessor.java | 56 +++
.../util/http/TestMimeHeadersIntegration.java | 2 +-
test/org/apache/tomcat/util/net/TestSsl.java | 2 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 6 +-
.../tomcat/util/net/jsse/openssl/TestCipher.java | 67 ++-
.../TestOpenSSLCipherConfigurationParser.java | 26 +-
.../util/net/jsse/openssl/TesterOpenSSL.java | 30 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 6 +-
.../websocket/TestWebSocketFrameClientSSL.java | 4 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 2 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 2 +-
.../tomcat/websocket/TestWsSubprotocols.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 20 +-
.../tomcat/websocket/TesterConnectionLimit.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 8 +-
.../websocket/pojo/TestPojoEndpointBase.java | 4 +-
.../websocket/pojo/TestPojoMethodMapping.java | 2 +-
.../apache/tomcat/websocket/server/TestClose.java | 2 +-
.../tomcat/websocket/server/TestCloseBug58624.java | 2 +-
.../server/TestWsRemoteEndpointImplServer.java | 2 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
test/webapp/WEB-INF/test.tld | 9 +
test/webapp/bug6nnnn/bug60032.jsp | 24 +
webapps/docs/cgi-howto.xml | 14 +-
webapps/docs/changelog.xml | 373 +++++++++++++-
webapps/docs/config/ajp.xml | 6 +
webapps/docs/config/context.xml | 36 +-
webapps/docs/config/engine.xml | 2 +-
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 31 +-
webapps/docs/config/listeners.xml | 29 +-
webapps/docs/config/realm.xml | 95 +++-
webapps/docs/config/valve.xml | 2 +-
webapps/docs/funcspecs/fs-admin-objects.xml | 1 -
webapps/docs/html-manager-howto.xml | 8 +-
webapps/docs/index.xml | 2 +-
webapps/docs/jasper-howto.xml | 4 +-
webapps/docs/manager-howto.xml | 2 +-
...ptor-howto.xml => mbeans-descriptors-howto.xml} | 8 +-
webapps/docs/project.xml | 4 +-
webapps/docs/realm-howto.xml | 9 +-
webapps/docs/security-howto.xml | 9 +
.../websocket/drawboard/DrawboardEndpoint.java | 4 +
webapps/examples/websocket/drawboard.xhtml | 2 +-
270 files changed, 3611 insertions(+), 1727 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
