This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit ffa42a345050c1465ffd7f64a91c25842e3b213b Merge: acd1216 7a55dee Author: Emmanuel Bourg <[email protected]> Date: Fri Mar 25 09:21:07 2016 +0100 Merge tag 'upstream/8.0.33' Upstream version 8.0.33 BUILDING.txt | 11 +- bin/catalina.sh | 28 +- build.properties.default | 14 +- conf/tomcat-users.xml | 19 +- conf/tomcat-users.xsd | 16 + java/javax/el/CompositeELResolver.java | 46 +-- java/javax/el/ImportHandler.java | 17 +- java/javax/servlet/ServletContext.java | 81 ++++-- .../servlet/jsp/el/ScopedAttributeELResolver.java | 47 ++- java/javax/websocket/SendResult.java | 8 +- java/org/apache/catalina/Context.java | 6 +- java/org/apache/catalina/Globals.java | 4 +- java/org/apache/catalina/InstanceEvent.java | 2 +- java/org/apache/catalina/InstanceListener.java | 2 +- java/org/apache/catalina/LifecycleState.java | 4 +- java/org/apache/catalina/Manager.java | 8 +- java/org/apache/catalina/Wrapper.java | 4 +- .../catalina/ant/jmx/JMXAccessorQueryTask.java | 2 +- .../catalina/authenticator/AuthenticatorBase.java | 4 +- .../catalina/authenticator/SingleSignOn.java | 11 +- java/org/apache/catalina/connector/Response.java | 5 +- .../catalina/core/ApplicationFilterChain.java | 2 +- java/org/apache/catalina/core/ApplicationPart.java | 15 +- java/org/apache/catalina/core/StandardContext.java | 20 +- java/org/apache/catalina/core/StandardServer.java | 20 +- java/org/apache/catalina/core/StandardService.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 10 +- .../apache/catalina/core/mbeans-descriptors.xml | 12 +- java/org/apache/catalina/filters/CorsFilter.java | 10 +- .../catalina/ha/session/ClusterManagerBase.java | 6 +- .../apache/catalina/loader/LocalStrings.properties | 3 +- .../catalina/loader/LocalStrings_es.properties | 2 +- java/org/apache/catalina/loader/ResourceEntry.java | 25 +- .../catalina/loader/WebappClassLoaderBase.java | 175 ++++++----- .../apache/catalina/manager/ManagerServlet.java | 9 - .../org/apache/catalina/mbeans/ContainerMBean.java | 13 +- java/org/apache/catalina/mbeans/ContextMBean.java | 18 ++ java/org/apache/catalina/mbeans/GroupMBean.java | 4 +- java/org/apache/catalina/mbeans/MBeanDumper.java | 4 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 27 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 32 +- .../catalina/mbeans/MemoryUserDatabaseMBean.java | 12 +- .../catalina/mbeans/NamingResourcesMBean.java | 9 + java/org/apache/catalina/mbeans/ServiceMBean.java | 15 +- java/org/apache/catalina/mbeans/UserMBean.java | 4 +- java/org/apache/catalina/realm/CombinedRealm.java | 5 +- .../org/apache/catalina/realm/DataSourceRealm.java | 41 +-- .../realm/DigestCredentialHandlerBase.java | 20 +- .../catalina/realm/JAASMemoryLoginModule.java | 110 ++++--- java/org/apache/catalina/realm/JAASRealm.java | 31 +- java/org/apache/catalina/realm/JDBCRealm.java | 48 ++- java/org/apache/catalina/realm/JNDIRealm.java | 321 ++++++++++----------- java/org/apache/catalina/realm/MemoryRealm.java | 11 +- java/org/apache/catalina/realm/RealmBase.java | 39 ++- .../apache/catalina/realm/UserDatabaseRealm.java | 2 +- .../catalina/security/SecurityClassLoad.java | 2 +- .../org/apache/catalina/security/SecurityUtil.java | 55 ++-- java/org/apache/catalina/session/Constants.java | 2 + java/org/apache/catalina/session/JDBCStore.java | 2 +- .../catalina/session/LocalStrings.properties | 1 + java/org/apache/catalina/session/ManagerBase.java | 6 +- .../apache/catalina/session/StandardSession.java | 2 +- .../catalina/startup/ClassLoaderFactory.java | 33 ++- .../org/apache/catalina/startup/ContextConfig.java | 27 +- java/org/apache/catalina/startup/HostConfig.java | 32 +- java/org/apache/catalina/startup/Tomcat.java | 4 +- .../storeconfig/ConnectorStoreAppender.java | 56 +++- .../apache/catalina/storeconfig/StoreAppender.java | 14 +- .../apache/catalina/storeconfig/StoreRegistry.java | 3 +- .../catalina/storeconfig/server-registry.xml | 4 +- .../apache/catalina/tribes/group/GroupChannel.java | 26 +- .../interceptors/MessageDispatch15Interceptor.java | 2 +- .../interceptors/MessageDispatchInterceptor.java | 10 +- .../catalina/tribes/membership/Membership.java | 2 +- .../tribes/tipis/AbstractReplicatedMap.java | 7 + .../tribes/transport/bio/util/FastQueue.java | 2 +- .../tribes/transport/bio/util/LinkObject.java | 2 +- .../bio/util/SingleRemoveSynchronizedAddLock.java | 2 +- java/org/apache/catalina/util/IOTools.java | 2 +- java/org/apache/catalina/util/InstanceSupport.java | 2 +- java/org/apache/catalina/util/RequestUtil.java | 4 +- java/org/apache/catalina/util/UriUtil.java | 28 +- .../valves/CometConnectionManagerValve.java | 2 +- .../catalina/valves/rewrite/RewriteValve.java | 8 +- .../catalina/valves/rewrite/Substitution.java | 51 +++- .../webresources/AbstractArchiveResourceSet.java | 55 +++- .../apache/catalina/webresources/JarResource.java | 6 +- .../catalina/webresources/JarResourceSet.java | 55 +++- .../catalina/webresources/JarWarResource.java | 32 +- .../catalina/webresources/JarWarResourceSet.java | 70 ++++- .../coyote/http11/AbstractNioInputBuffer.java | 2 +- .../apache/coyote/http11/Http11Nio2Processor.java | 13 +- .../apache/coyote/http11/Http11NioProcessor.java | 14 +- .../coyote/http11/InternalAprInputBuffer.java | 2 +- .../apache/coyote/http11/InternalInputBuffer.java | 2 +- java/org/apache/el/parser/AstIdentifier.java | 22 +- java/org/apache/jasper/Constants.java | 2 +- java/org/apache/jasper/compiler/JDTCompiler.java | 8 + java/org/apache/jasper/compiler/PageInfo.java | 2 +- java/org/apache/jasper/servlet/JspServlet.java | 2 +- .../org/apache/naming/factory/SendMailFactory.java | 2 +- java/org/apache/tomcat/jni/SSL.java | 4 +- .../org/apache/tomcat/util/IntrospectionUtils.java | 4 + java/org/apache/tomcat/util/buf/UriUtil.java | 131 +++++++++ .../tomcat/util/http/LegacyCookieProcessor.java | 4 +- .../apache/tomcat/util/http/parser/HttpParser.java | 16 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 10 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 4 - java/org/apache/tomcat/util/net/NioEndpoint.java | 56 ++-- .../KeyExchange.java => SendfileState.java} | 35 +-- java/org/apache/tomcat/util/net/URL.java | 4 +- .../tomcat/util/net/jsse/openssl/Cipher.java | 5 +- .../tomcat/util/net/jsse/openssl/KeyExchange.java | 2 +- .../openssl/OpenSSLCipherConfigurationParser.java | 114 ++++++-- java/org/apache/tomcat/util/scan/Constants.java | 5 +- .../tomcat/util/scan/StandardJarScanner.java | 5 +- .../websocket/AsyncChannelWrapperSecure.java | 4 +- .../tomcat/websocket/FutureToSendHandler.java | 12 + .../apache/tomcat/websocket/PerMessageDeflate.java | 12 +- .../apache/tomcat/websocket/Transformation.java | 5 + java/org/apache/tomcat/websocket/WsFrameBase.java | 5 + .../tomcat/websocket/WsRemoteEndpointImplBase.java | 6 +- java/org/apache/tomcat/websocket/WsSession.java | 15 +- .../tomcat/websocket/WsWebSocketContainer.java | 5 +- .../apache/tomcat/websocket/server/Constants.java | 2 +- .../server/WsRemoteEndpointImplServer.java | 4 - res/confinstall/tomcat-users_2.xml | 19 +- 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/rat/rat-excludes.txt | 85 +++--- res/tomcat.nsi | 51 +++- .../apache/catalina/connector/TestResponse.java | 40 +++ .../catalina/loader/TestWebappClassLoader.java | 49 +++- .../catalina/valves/TesterAccessLogValve.java | 2 +- .../catalina/valves/rewrite/TestRewriteValve.java | 42 +++ .../coyote/http11/TestInternalInputBuffer.java | 65 +++++ test/org/apache/tomcat/util/buf/TestUriUtil.java | 87 ++++++ .../TestOpenSSLCipherConfigurationParser.java | 227 ++++----------- .../TestOpenSSLCipherConfigurationParserOnly.java | 34 +++ .../util/net/jsse/openssl/TesterOpenSSL.java | 166 ++++------- .../apache/tomcat/websocket/server/TestClose.java | 8 +- .../tomcat/websocket/server/TestCloseBug58264.java | 134 +++++++++ webapps/docs/building.xml | 9 +- webapps/docs/changelog.xml | 261 ++++++++++++++++- webapps/docs/config/automatic-deployment.xml | 7 +- webapps/docs/config/cluster-manager.xml | 2 + webapps/docs/manager-howto.xml | 8 +- webapps/docs/proxy-howto.xml | 2 +- webapps/docs/rewrite.xml | 4 + .../examples/WEB-INF/classes/chat/ChatServlet.java | 2 +- 155 files changed, 2595 insertions(+), 1290 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
