This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 176b70325155fff2c01edf15f0a77ff428307e19 Merge: d58e1c0 d286e3e Author: Emmanuel Bourg <[email protected]> Date: Sat Apr 23 11:26:58 2016 +0200 Merge tag 'upstream/7.0.69' Upstream version 7.0.69 BUILDING.txt | 11 +- bin/catalina.bat | 9 + bin/catalina.sh | 9 + build.properties.default | 8 +- conf/tomcat-users.xml | 19 +- .../catalina/authenticator/AuthenticatorBase.java | 4 +- .../catalina/authenticator/SingleSignOn.java | 11 +- .../apache/catalina/connector/CoyoteAdapter.java | 3 +- java/org/apache/catalina/connector/Response.java | 3 +- java/org/apache/catalina/core/ApplicationPart.java | 15 +- .../org/apache/catalina/core/AsyncContextImpl.java | 4 +- .../apache/catalina/core/AsyncListenerWrapper.java | 34 +- .../apache/catalina/core/StandardHostValve.java | 9 +- java/org/apache/catalina/core/StandardServer.java | 20 +- .../apache/catalina/core/mbeans-descriptors.xml | 12 +- .../apache/catalina/loader/LocalStrings.properties | 3 +- .../catalina/loader/LocalStrings_es.properties | 2 +- .../catalina/loader/WebappClassLoaderBase.java | 33 +- java/org/apache/catalina/realm/JNDIRealm.java | 189 +++++----- .../catalina/security/SecurityClassLoad.java | 5 + java/org/apache/catalina/session/Constants.java | 2 + .../catalina/session/LocalStrings.properties | 1 + java/org/apache/catalina/session/ManagerBase.java | 5 +- .../catalina/session/PersistentManagerBase.java | 50 +-- .../catalina/startup/ClassLoaderFactory.java | 33 +- .../org/apache/catalina/startup/ContextConfig.java | 12 +- java/org/apache/catalina/startup/HostConfig.java | 30 +- .../catalina/startup/LocalStrings.properties | 2 +- .../catalina/startup/LocalStrings_es.properties | 2 +- java/org/apache/catalina/startup/Tomcat.java | 4 +- .../catalina/startup/WebappServiceLoader.java | 3 +- .../interceptors/StaticMembershipInterceptor.java | 1 + .../catalina/tribes/membership/McastService.java | 2 + .../catalina/tribes/membership/MemberImpl.java | 13 + .../tribes/membership/mbeans-descriptors.xml | 12 + .../tribes/tipis/AbstractReplicatedMap.java | 14 +- java/org/apache/coyote/AsyncStateMachine.java | 18 +- .../apache/coyote/http11/Http11NioProcessor.java | 14 +- java/org/apache/tomcat/jni/SSL.java | 4 +- java/org/apache/tomcat/util/buf/UriUtil.java | 131 +++++++ .../apache/tomcat/util/file/ConfigFileLoader.java | 34 +- .../tomcat/util/file/LocalStrings.properties | 16 + java/org/apache/tomcat/util/http/ServerCookie.java | 1 - .../apache/tomcat/util/http/parser/HttpParser.java | 16 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 48 ++- java/org/apache/tomcat/util/net/SendfileState.java | 37 ++ .../tomcat/util/net/jsse/JSSESocketFactory.java | 41 ++- .../util/net/jsse/res/LocalStrings.properties | 1 + .../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 | 3 +- .../tomcat/websocket/WsWebSocketContainer.java | 5 +- .../tomcat/websocket/server/WsServerContainer.java | 18 + res/confinstall/tomcat-users_2.xml | 19 +- res/ide-support/eclipse/eclipse.classpath | 1 + res/maven/mvn.properties.default | 2 +- res/rat/rat-excludes.txt | 8 +- res/tomcat.nsi | 50 ++- .../apache/catalina/connector/TestResponse.java | 40 +++ .../apache/catalina/connector/TestSendFile.java | 166 +++++++++ .../apache/catalina/core/TestAsyncContextImpl.java | 59 ++++ .../catalina/session/TestPersistentManager.java | 300 ++-------------- ....java => TestPersistentManagerIntegration.java} | 90 +---- test/org/apache/catalina/session/TesterStore.java | 94 +++++ test/org/apache/tomcat/unittest/TesterContext.java | 10 +- test/org/apache/tomcat/unittest/TesterHost.java | 391 +++++++++++++++++++++ test/org/apache/tomcat/util/buf/TestUriUtil.java | 87 +++++ .../tomcat/websocket/server/TestCloseBug58264.java | 134 +++++++ webapps/docs/building.xml | 9 +- webapps/docs/changelog.xml | 250 ++++++++++++- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/cluster-manager.xml | 2 + webapps/docs/config/http.xml | 23 +- webapps/docs/config/manager.xml | 24 +- webapps/docs/logging.xml | 2 +- webapps/docs/maven-jars.xml | 4 +- webapps/docs/proxy-howto.xml | 2 +- .../examples/WEB-INF/classes/chat/ChatServlet.java | 2 +- .../classes/websocket/echo/EchoEndpoint.java | 36 +- 85 files changed, 2146 insertions(+), 690 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
