This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 07d6f638e525d51ecc9fb41dcf2c17f7fa8d8125 Merge: ed40aac 10c36ee Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 29 13:20:23 2014 +0200 Merge tag 'upstream/8.0.14' Upstream version 8.0.14 bin/catalina.bat | 4 +- build.properties.default | 9 +- build.xml | 21 +- conf/server.xml | 1 + java/javax/el/BeanELResolver.java | 7 +- java/javax/el/CompositeELResolver.java | 4 +- java/javax/el/Util.java | 3 +- java/javax/servlet/http/HttpUtils.java | 3 +- .../javax/servlet/jsp/tagext/SimpleTagSupport.java | 9 +- java/javax/websocket/Session.java | 48 +- java/org/apache/catalina/Context.java | 37 + java/org/apache/catalina/Realm.java | 11 +- .../catalina/ant/jmx/JMXAccessorCondition.java | 164 +- ...ondition.java => JMXAccessorConditionBase.java} | 74 +- .../ant/jmx/JMXAccessorEqualsCondition.java | 166 +- .../catalina/authenticator/AuthenticatorBase.java | 12 +- .../authenticator/DigestAuthenticator.java | 24 +- .../catalina/authenticator/SSLAuthenticator.java | 2 +- .../apache/catalina/connector/CoyoteAdapter.java | 21 +- java/org/apache/catalina/connector/Request.java | 4 + .../catalina/core/DefaultInstanceManager.java | 77 +- .../apache/catalina/core/LocalStrings.properties | 1 + java/org/apache/catalina/core/StandardContext.java | 52 +- java/org/apache/catalina/core/StandardHost.java | 6 +- .../apache/catalina/core/mbeans-descriptors.xml | 9 + .../apache/catalina/loader/JdbcLeakPrevention.java | 13 +- .../apache/catalina/loader/LocalStrings.properties | 3 + .../catalina/loader/ParallelWebappClassLoader.java | 73 + .../apache/catalina/loader/WebappClassLoader.java | 2798 +------------------- ...ClassLoader.java => WebappClassLoaderBase.java} | 259 +- java/org/apache/catalina/loader/WebappLoader.java | 25 +- .../apache/catalina/loader/mbeans-descriptors.xml | 31 + java/org/apache/catalina/realm/RealmBase.java | 73 +- .../catalina/security/SecurityClassLoad.java | 4 +- .../apache/catalina/servlets/DefaultServlet.java | 39 +- .../apache/catalina/servlets/WebdavServlet.java | 22 +- .../org/apache/catalina/startup/ContextConfig.java | 139 +- .../org/apache/catalina/startup/FailedContext.java | 21 +- java/org/apache/catalina/startup/HostConfig.java | 7 +- .../catalina/startup/LocalStrings.properties | 8 + .../catalina/startup/VersionLoggerListener.java | 72 + .../apache/catalina/startup/WebAnnotationSet.java | 30 +- java/org/apache/catalina/util/CharsetMapper.java | 5 +- .../apache/catalina/util/ExtensionValidator.java | 14 +- java/org/apache/catalina/util/ServerInfo.java | 8 +- .../catalina/valves/ExtendedAccessLogValve.java | 4 +- .../catalina/valves/StuckThreadDetectionValve.java | 4 + .../apache/catalina/valves/mbeans-descriptors.xml | 5 + .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 8 + java/org/apache/coyote/ajp/AjpAprProtocol.java | 5 +- java/org/apache/coyote/ajp/AjpNio2Protocol.java | 5 +- java/org/apache/coyote/ajp/AjpNioProtocol.java | 5 +- java/org/apache/coyote/ajp/AjpProtocol.java | 6 +- .../coyote/http11/AbstractHttp11Protocol.java | 19 + .../apache/coyote/http11/Http11AprProcessor.java | 30 +- .../apache/coyote/http11/Http11AprProtocol.java | 16 +- .../apache/coyote/http11/Http11Nio2Processor.java | 27 +- .../apache/coyote/http11/Http11Nio2Protocol.java | 15 +- .../apache/coyote/http11/Http11NioProcessor.java | 27 +- .../apache/coyote/http11/Http11NioProtocol.java | 15 +- java/org/apache/coyote/http11/Http11Processor.java | 22 +- java/org/apache/coyote/http11/Http11Protocol.java | 19 +- java/org/apache/el/lang/ELArithmetic.java | 68 +- java/org/apache/el/stream/Stream.java | 4 +- java/org/apache/jasper/Constants.java | 3 + java/org/apache/jasper/JspC.java | 4 + java/org/apache/jasper/compiler/Compiler.java | 5 +- java/org/apache/jasper/compiler/JDTCompiler.java | 10 +- java/org/apache/jasper/servlet/JspServlet.java | 11 +- .../apache/jasper/servlet/JspServletWrapper.java | 4 +- .../apache/tomcat/InstrumentableClassLoader.java | 4 +- java/org/apache/tomcat/buildutil/SignCode.java | 76 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 5 +- .../tomcat/dbcp/dbcp2/DelegatingConnection.java | 8 +- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 584 ++-- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 8 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 8 +- .../dbcp/dbcp2/PoolableConnectionFactory.java | 4 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 2 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java | 42 +- .../dbcp2/datasources/CPDSConnectionFactory.java | 4 +- .../datasources/KeyedCPDSConnectionFactory.java | 8 +- .../org/apache/tomcat/dbcp/dbcp2/package-info.java | 2 +- .../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 2 +- .../tomcat/dbcp/pool2/impl/AbandonedConfig.java | 8 +- .../dbcp/pool2/impl/BaseGenericObjectPool.java | 40 +- .../tomcat/dbcp/pool2/impl/EvictionTimer.java | 24 +- .../dbcp/pool2/impl/GenericKeyedObjectPool.java | 29 +- .../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 27 +- .../dbcp/pool2/impl/LinkedBlockingDeque.java | 174 +- .../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +- java/org/apache/tomcat/util/bcel/Constants.java | 67 - .../tomcat/util/bcel/classfile/AccessFlags.java | 41 - .../util/bcel/classfile/AnnotationDefault.java | 68 - .../bcel/classfile/AnnotationElementValue.java | 4 +- .../util/bcel/classfile/AnnotationEntry.java | 32 +- .../tomcat/util/bcel/classfile/Annotations.java | 34 +- .../util/bcel/classfile/ArrayElementValue.java | 4 +- .../tomcat/util/bcel/classfile/Attribute.java | 198 -- .../util/bcel/classfile/ClassElementValue.java | 5 +- .../tomcat/util/bcel/classfile/ClassParser.java | 110 +- .../apache/tomcat/util/bcel/classfile/Code.java | 148 -- .../tomcat/util/bcel/classfile/Constant.java | 91 +- .../tomcat/util/bcel/classfile/ConstantCP.java | 76 - .../tomcat/util/bcel/classfile/ConstantClass.java | 14 +- .../tomcat/util/bcel/classfile/ConstantDouble.java | 15 +- .../util/bcel/classfile/ConstantFieldref.java | 44 - .../tomcat/util/bcel/classfile/ConstantFloat.java | 15 +- .../util/bcel/classfile/ConstantInteger.java | 15 +- .../bcel/classfile/ConstantInterfaceMethodref.java | 44 - .../util/bcel/classfile/ConstantInvokeDynamic.java | 48 - .../tomcat/util/bcel/classfile/ConstantLong.java | 15 +- .../util/bcel/classfile/ConstantMethodHandle.java | 48 - .../util/bcel/classfile/ConstantMethodType.java | 47 - .../util/bcel/classfile/ConstantMethodref.java | 44 - .../util/bcel/classfile/ConstantNameAndType.java | 77 - .../tomcat/util/bcel/classfile/ConstantPool.java | 161 +- .../tomcat/util/bcel/classfile/ConstantString.java | 65 - .../tomcat/util/bcel/classfile/ConstantUtf8.java | 50 +- .../tomcat/util/bcel/classfile/ConstantValue.java | 48 - .../tomcat/util/bcel/classfile/Deprecated.java | 66 - .../tomcat/util/bcel/classfile/ElementValue.java | 15 +- .../util/bcel/classfile/ElementValuePair.java | 17 +- .../util/bcel/classfile/EnclosingMethod.java | 39 - .../util/bcel/classfile/EnumElementValue.java | 5 +- .../tomcat/util/bcel/classfile/ExceptionTable.java | 81 - .../util/bcel/classfile/FastDataInputStream.java | 234 ++ .../tomcat/util/bcel/classfile/FieldOrMethod.java | 149 -- .../tomcat/util/bcel/classfile/InnerClasses.java | 55 - .../tomcat/util/bcel/classfile/JavaClass.java | 151 +- .../util/bcel/classfile/LineNumberTable.java | 52 - .../util/bcel/classfile/LocalVariableTable.java | 51 - .../bcel/classfile/LocalVariableTypeTable.java | 63 - .../tomcat/util/bcel/classfile/PMGClass.java | 49 - .../bcel/classfile/ParameterAnnotationEntry.java | 50 - .../util/bcel/classfile/ParameterAnnotations.java | 77 - .../classfile/RuntimeInvisibleAnnotations.java | 50 - .../RuntimeInvisibleParameterAnnotations.java | 45 - .../bcel/classfile/RuntimeVisibleAnnotations.java | 50 - .../RuntimeVisibleParameterAnnotations.java | 45 - .../util/bcel/classfile/SimpleElementValue.java | 5 +- .../tomcat/util/bcel/classfile/SourceFile.java | 50 - .../apache/tomcat/util/bcel/classfile/Utility.java | 157 +- .../tomcat/util/bcel/util/BCELComparator.java | 45 - java/org/apache/tomcat/util/buf/HexUtils.java | 31 +- .../descriptor/web/FragmentJarScannerCallback.java | 16 +- .../apache/tomcat/util/descriptor/web/WebXml.java | 2 +- java/org/apache/tomcat/util/http/Cookies.java | 61 +- .../org/apache/tomcat/util/http/ServerCookies.java | 72 + .../tomcat/util/http/parser/AcceptLanguage.java | 4 +- .../tomcat/util/http/parser/Authorization.java | 6 +- .../org/apache/tomcat/util/http/parser/Cookie.java | 679 +++++ .../apache/tomcat/util/http/parser/HttpParser.java | 7 - .../util/http/parser/LocalStrings.properties | 19 + .../apache/tomcat/util/http/parser/MediaType.java | 12 +- .../Constants.java => http/parser/SkipResult.java} | 16 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 22 + .../tomcat/util/net/res/LocalStrings.properties | 2 + .../util/security}/ConcurrentMessageDigest.java | 17 +- .../util => tomcat/util/security}/MD5Encoder.java | 2 +- java/org/apache/tomcat/util/threads/Constants.java | 5 + .../tomcat/util/threads/TaskThreadFactory.java | 2 +- .../apache/tomcat/websocket/PerMessageDeflate.java | 2 +- java/org/apache/tomcat/websocket/Util.java | 6 +- java/org/apache/tomcat/websocket/WsSession.java | 32 +- .../tomcat/websocket/WsWebSocketContainer.java | 10 +- .../tomcat/websocket/pojo/PojoEndpointClient.java | 2 +- .../pojo/PojoMessageHandlerPartialBinary.java | 2 +- .../pojo/PojoMessageHandlerPartialText.java | 2 +- .../websocket/server/LocalStrings.properties | 2 +- .../tomcat/websocket/server/UpgradeUtil.java | 51 +- .../websocket/server/WsHttpUpgradeHandler.java | 12 +- .../tomcat/websocket/server/WsServerContainer.java | 45 +- res/META-INF/websocket-api.jar.manifest | 8 +- res/checkstyle/checkstyle.xml | 12 +- res/maven/mvn.properties.default | 2 +- .../authenticator/TestDigestAuthenticator.java | 4 +- .../TestSSOnonLoginAndDigestAuthenticator.java | 4 +- .../TesterDigestAuthenticatorPerformance.java | 4 +- .../org/apache/catalina/connector/TestRequest.java | 4 +- .../apache/catalina/core/TestStandardContext.java | 13 + test/org/apache/catalina/core/TesterContext.java | 17 + .../apache/catalina/filters/TestExpiresFilter.java | 142 +- .../loader/TestWebappClassLoaderMemoryLeak.java | 2 +- ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 4 +- .../apache/jasper/runtime/TestPageContextImpl.java | 32 + test/org/apache/juli/TestDateFormatCache.java | 12 +- .../apache/tomcat/util/bcel/TesterPerformance.java | 72 + test/org/apache/tomcat/util/buf/TestHexUtils.java | 42 +- test/org/apache/tomcat/util/http/TestCookies.java | 421 ++- .../tomcat/util/http/TesterCookiesPerformance.java | 75 + .../org/apache/tomcat/util/net/TestClientCert.java | 4 - test/org/apache/tomcat/websocket/TestUtil.java | 10 +- .../websocket/pojo/TestEncodingDecoding.java | 9 +- test/webapp/jsp/pageContext1.jsp | 39 + .../webapp/jsp/pageContext2.jsp | 28 +- webapps/docs/changelog.xml | 239 +- webapps/docs/class-loader-howto.xml | 12 +- webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/context.xml | 37 +- webapps/docs/config/listeners.xml | 13 + webapps/docs/config/loader.xml | 15 +- webapps/docs/config/systemprops.xml | 3 + webapps/docs/windows-auth-howto.xml | 34 +- 204 files changed, 4043 insertions(+), 7460 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
