This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 2d6205961cc28c6acc7191f50176e9bc351b6d16 Merge: d43b63c fbc50ea Author: Emmanuel Bourg <[email protected]> Date: Sun Sep 14 13:29:31 2014 +0200 Merge tag 'upstream/8.0.12' Upstream version 8.0.12 BUILDING.txt | 2 +- RELEASE-NOTES | 11 +- bin/daemon.sh | 4 +- bin/setclasspath.bat | 13 +- bin/setclasspath.sh | 12 +- build.properties.default | 24 +- build.xml | 82 +- java/javax/el/ELProcessor.java | 86 +- java/javax/el/Util.java | 31 +- java/javax/servlet/http/Cookie.java | 2 +- java/org/apache/catalina/Manager.java | 22 + java/org/apache/catalina/SessionIdGenerator.java | 59 + java/org/apache/catalina/Wrapper.java | 2 +- .../catalina/authenticator/AuthenticatorBase.java | 42 +- .../catalina/authenticator/SSLAuthenticator.java | 23 +- .../catalina/authenticator/SingleSignOn.java | 19 + .../apache/catalina/connector/CoyoteAdapter.java | 63 +- .../org/apache/catalina/connector/InputBuffer.java | 12 +- java/org/apache/catalina/connector/Request.java | 260 +- java/org/apache/catalina/connector/Response.java | 54 +- .../catalina/connector/mbeans-descriptors.xml | 4 + .../catalina/core/ApplicationContextFacade.java | 7 +- .../catalina/core/ApplicationHttpRequest.java | 23 + java/org/apache/catalina/core/ContainerBase.java | 40 +- .../apache/catalina/core/LocalStrings.properties | 3 + java/org/apache/catalina/core/StandardContext.java | 61 +- .../apache/catalina/core/StandardHostValve.java | 114 +- java/org/apache/catalina/core/StandardServer.java | 8 + .../catalina/ha/session/ClusterManagerBase.java | 1 - .../apache/catalina/loader/WebappClassLoader.java | 26 +- .../apache/catalina/manager/ManagerServlet.java | 9 +- .../apache/catalina/mapper/LocalStrings.properties | 7 + java/org/apache/catalina/mapper/Mapper.java | 965 ++++--- .../org/apache/catalina/mapper/MapperListener.java | 113 +- .../apache/catalina/mapper/WrapperMappingInfo.java | 52 +- java/org/apache/catalina/realm/JNDIRealm.java | 8 +- .../catalina/security/SecurityClassLoad.java | 2 +- .../apache/catalina/servlets/DefaultServlet.java | 27 +- .../apache/catalina/servlets/WebdavServlet.java | 12 + java/org/apache/catalina/session/ManagerBase.java | 75 +- .../catalina/session/PersistentManagerBase.java | 26 +- java/org/apache/catalina/session/package.html | 2 - .../catalina/startup/CatalinaProperties.java | 20 +- .../org/apache/catalina/startup/ContextConfig.java | 9 +- .../apache/catalina/startup/ContextRuleSet.java | 8 + java/org/apache/catalina/startup/Tomcat.java | 9 +- .../apache/catalina/startup/WebAnnotationSet.java | 138 +- .../apache/catalina/storeconfig/IStoreConfig.java | 20 +- .../catalina/storeconfig/LocalStrings.properties | 2 + .../apache/catalina/storeconfig/StoreConfig.java | 69 +- .../catalina/storeconfig/server-registry.xml | 1 + .../apache/catalina/tribes/group/RpcChannel.java | 3 +- .../tribes/tipis/AbstractReplicatedMap.java | 14 +- .../tribes/transport/bio/MultipointBioSender.java | 3 +- .../tribes/transport/nio/ParallelNioSender.java | 3 +- .../apache/catalina/util/LocalStrings.properties | 9 +- .../catalina/util/LocalStrings_es.properties | 2 +- .../catalina/util/LocalStrings_fr.properties | 2 +- .../catalina/util/LocalStrings_ja.properties | 2 +- ...dGenerator.java => SessionIdGeneratorBase.java} | 71 +- .../catalina/util/StandardSessionIdGenerator.java | 64 + java/org/apache/catalina/util/StringParser.java | 3 + .../apache/catalina/valves/ErrorReportValve.java | 10 +- java/org/apache/catalina/valves/SSLValve.java | 44 +- .../catalina/valves/rewrite/RewriteValve.java | 6 +- java/org/apache/catalina/webresources/Cache.java | 79 +- .../catalina/webresources/CachedResource.java | 41 +- .../apache/catalina/webresources/StandardRoot.java | 26 +- java/org/apache/coyote/AbstractProtocol.java | 8 +- java/org/apache/coyote/AsyncStateMachine.java | 5 +- java/org/apache/coyote/ContainerThreadMarker.java | 12 +- .../apache/coyote/ajp/AbstractAjpProcessor.java | 24 +- java/org/apache/coyote/ajp/Constants.java | 1 + .../coyote/http11/AbstractHttp11Processor.java | 5 +- .../apache/coyote/http11/AbstractInputBuffer.java | 2 +- .../apache/coyote/http11/Http11AprProcessor.java | 30 +- .../apache/coyote/http11/Http11Nio2Processor.java | 41 +- .../apache/coyote/http11/Http11NioProcessor.java | 27 +- java/org/apache/coyote/http11/Http11Processor.java | 22 +- .../coyote/http11/filters/IdentityInputFilter.java | 2 +- java/org/apache/el/lang/ELSupport.java | 25 + java/org/apache/el/lang/ExpressionBuilder.java | 8 +- java/org/apache/el/parser/AstFunction.java | 27 +- java/org/apache/el/util/ReflectionUtil.java | 20 +- java/org/apache/jasper/compiler/Generator.java | 14 + java/org/apache/jasper/el/JasperELResolver.java | 2 +- .../jasper/resources/LocalStrings.properties | 2 +- .../jasper/resources/LocalStrings_es.properties | 2 +- java/org/apache/jasper/servlet/JspServlet.java | 14 - .../apache/jasper/servlet/JspServletWrapper.java | 3 +- java/org/apache/tomcat/buildutil/SignCode.java | 360 +++ .../dbcp2/datasources/InstanceKeyDataSource.java | 2 +- .../dbcp/pool2/impl/BaseGenericObjectPool.java | 13 + .../dbcp/pool2/impl/BaseObjectPoolConfig.java | 37 + .../dbcp/pool2/impl/GenericKeyedObjectPool.java | 28 +- .../pool2/impl/GenericKeyedObjectPoolMXBean.java | 5 + .../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 23 +- .../dbcp/pool2/impl/GenericObjectPoolMXBean.java | 5 + .../pool2/impl/InterruptibleReentrantLock.java | 10 + .../dbcp/pool2/impl/LinkedBlockingDeque.java | 33 +- .../apache/tomcat/jni/socket/AprSocketContext.java | 111 +- .../tomcat/util/bcel/classfile/ElementValue.java | 1 - .../bcel/classfile/LocalVariableTypeTable.java | 20 +- .../classfile/RuntimeInvisibleAnnotations.java | 4 +- .../apache/tomcat/util/bcel/classfile/Utility.java | 2 +- .../apache/tomcat/util/descriptor/web/WebXml.java | 27 +- java/org/apache/tomcat/util/file/Matcher.java | 33 +- java/org/apache/tomcat/util/http/Cookies.java | 177 +- .../util/http/fileupload/disk/DiskFileItem.java | 3 +- .../tomcat/util/http/parser/AcceptLanguage.java | 78 + .../tomcat/util/http/parser/Authorization.java | 6 +- .../apache/tomcat/util/http/parser/HttpParser.java | 89 +- .../apache/tomcat/util/http/parser/MediaType.java | 12 +- .../apache/tomcat/util/modeler/ManagedBean.java | 127 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 7 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 281 +-- java/org/apache/tomcat/util/net/NioEndpoint.java | 20 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 27 +- .../util/net/jsse/openssl/Authentication.java} | 30 +- .../tomcat/util/net/jsse/openssl/Cipher.java | 2645 ++++++++++++++++++++ .../util/net/jsse/openssl/Encryption.java} | 19 +- .../util/net/jsse/openssl/EncryptionLevel.java} | 19 +- .../util/net/jsse/openssl/KeyExchange.java} | 30 +- .../util/net/jsse/openssl/MessageDigest.java} | 19 +- .../openssl/OpenSSLCipherConfigurationParser.java | 697 ++++++ .../util/net/jsse/openssl/Protocol.java} | 30 +- .../util/net/jsse/res/LocalStrings.properties | 4 +- .../tomcat/util/threads/ThreadPoolExecutor.java | 13 +- .../websocket/AsyncChannelWrapperSecure.java | 3 +- java/org/apache/tomcat/websocket/Constants.java | 13 + .../tomcat/websocket/LocalStrings.properties | 10 +- java/org/apache/tomcat/websocket/MessagePart.java | 76 + .../apache/tomcat/websocket/PerMessageDeflate.java | 439 ++++ .../apache/tomcat/websocket/Transformation.java | 97 + .../tomcat/websocket/TransformationFactory.java | 45 +- .../tomcat/websocket/TransformationResult.java | 39 +- java/org/apache/tomcat/websocket/Util.java | 87 +- .../org/apache/tomcat/websocket/WsExtension.java | 38 +- .../websocket/WsExtensionParameter.java} | 29 +- java/org/apache/tomcat/websocket/WsFrameBase.java | 239 +- .../org/apache/tomcat/websocket/WsFrameClient.java | 6 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 124 +- java/org/apache/tomcat/websocket/WsSession.java | 3 +- .../tomcat/websocket/WsWebSocketContainer.java | 16 +- .../websocket/pojo/PojoMessageHandlerBase.java | 2 +- .../server/DefaultServerEndpointConfigurator.java | 9 +- .../tomcat/websocket/server/UpgradeUtil.java | 110 +- .../tomcat/websocket/server/WsFrameServer.java | 13 +- .../websocket/server/WsHttpUpgradeHandler.java | 17 +- .../server/WsRemoteEndpointImplServer.java | 12 +- modules/jdbc-pool/build.properties.default | 12 +- modules/jdbc-pool/doc/changelog.xml | 19 +- modules/jdbc-pool/doc/jdbc-pool.xml | 38 +- modules/jdbc-pool/pom.xml | 12 +- .../jdbc/naming/GenericNamingResourcesFactory.java | 9 +- .../apache/tomcat/jdbc/pool/ClassLoaderUtil.java | 61 + .../apache/tomcat/jdbc/pool/ConnectionPool.java | 39 +- .../apache/tomcat/jdbc/pool/DataSourceProxy.java | 9 +- .../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 39 +- .../apache/tomcat/jdbc/pool/PoolProperties.java | 25 +- .../apache/tomcat/jdbc/pool/PooledConnection.java | 62 +- .../jdbc/pool/interceptor/SlowQueryReport.java | 40 +- .../jdbc/pool/interceptor/StatementFinalizer.java | 65 +- .../java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 177 ++ .../java/org/apache/tomcat/jdbc/bugs/Bug54225.java | 65 + .../java/org/apache/tomcat/jdbc/bugs/Bug54227.java | 67 + .../java/org/apache/tomcat/jdbc/bugs/Bug54978.java | 67 + .../tomcat/jdbc/pool/ShouldForceReconnectTest.java | 142 ++ .../apache/tomcat/jdbc/test/DefaultTestCase.java | 5 - .../apache/tomcat/jdbc/test/PoolCleanerTest.java | 2 +- .../tomcat/jdbc/test/StatementFinalizerTest.java | 18 + .../test/TestJdbcInterceptorConfigParsing.java | 179 ++ .../tomcat/jdbc/test/TestSlowQueryReport.java | 166 +- .../jdbc/test/TestValidationQueryTimeout.java | 48 +- res/checkstyle/org-import-control.xml | 1 + res/ide-support/eclipse/eclipse.classpath | 2 +- .../netbeans/nb-tomcat-build.properties | 2 +- res/ide-support/netbeans/project.xml | 2 +- res/maven/mvn.properties.default | 2 +- res/maven/tomcat-embed-jasper.pom | 2 +- res/maven/tomcat-jasper.pom | 2 +- res/tomcat.nsi | 3 + test/javax/el/TestELProcessor.java | 62 + test/javax/el/TesterFunctions.java | 24 + .../TesterDigestAuthenticatorPerformance.java | 2 +- .../org/apache/catalina/connector/TestRequest.java | 54 + .../apache/catalina/connector/TesterRequest.java | 38 + .../apache/catalina/core/TestAsyncContextImpl.java | 11 +- test/org/apache/catalina/mapper/TestMapper.java | 393 ++- .../catalina/mapper/TestMapperContextRoot.java | 79 - .../apache/catalina/mapper/TestMapperListener.java | 128 + .../apache/catalina/mapper/TestMapperWebapps.java | 241 ++ .../catalina/mapper/TestMapperWelcomeFiles.java | 94 - .../catalina/nonblocking/TestNonBlockingAPI.java | 10 +- test/org/apache/catalina/realm/TestRealmBase.java | 4 +- .../catalina/session/TestPersistentManager.java | 231 ++ .../apache/catalina/valves/TestRemoteIpValve.java | 79 + .../webresources/AbstractTestDirResourceSet.java | 4 +- .../webresources/AbstractTestFileResourceSet.java | 4 +- test/org/apache/el/TestMethodExpressionImpl.java | 18 + test/org/apache/el/TesterBeanA.java | 8 + test/org/apache/el/TesterBeanAA.java | 12 +- .../org/apache/jasper/el/TestJasperELResolver.java | 1 - test/org/apache/jasper/servlet/TestJspServlet.java | 49 +- .../util/http/parser/TestAcceptLanguage.java | 277 ++ .../org/apache/tomcat/util/net/TestClientCert.java | 39 +- test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 +- test/org/apache/tomcat/util/net/TesterSupport.java | 9 +- .../tomcat/util/net/jsse/openssl/TestCipher.java | 927 +++++++ .../TestOpenSSLCipherConfigurationParser.java | 513 ++++ .../util/net/jsse/openssl/TesterOpenSSL.java | 216 ++ test/org/apache/tomcat/websocket/TestUtil.java | 100 + .../forward/one.jsp => test/webapp/jsp/error.jsp | 9 +- webapps/docs/changelog.xml | 493 +++- webapps/docs/config/cluster-manager.xml | 3 +- webapps/docs/config/http.xml | 19 +- webapps/docs/config/manager.xml | 36 +- webapps/docs/config/project.xml | 1 + webapps/docs/config/sessionidgenerator.xml | 131 + webapps/docs/config/valve.xml | 24 + webapps/docs/funcspecs/fs-admin-objects.xml | 8 +- webapps/docs/index.xml | 2 + .../examples/WEB-INF/classes/CookieExample.java | 14 +- .../WEB-INF/classes/util/CookieFilter.java | 18 +- webapps/examples/jsp/forward/one.jsp | 2 +- webapps/examples/jsp/forward/two.html | 2 +- webapps/examples/jsp/include/foo.jsp | 6 +- webapps/examples/jsp/include/include.jsp | 9 +- 229 files changed, 13182 insertions(+), 2444 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
