This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit a31058b285f9da8cd95333d9bbff9e81edc76151 Merge: 6f86bd9 e5721e4 Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 11:41:12 2015 +0200 Merge tag 'upstream/7.0.62' Upstream version 7.0.62 bin/catalina.sh | 2 + build.properties.default | 2 +- .../catalina/authenticator/BasicAuthenticator.java | 11 +- .../catalina/authenticator/LocalStrings.properties | 24 ++ .../catalina/authenticator/SingleSignOn.java | 422 +++++++++++---------- .../catalina/authenticator/SingleSignOnEntry.java | 101 +++-- .../authenticator/SingleSignOnListener.java | 64 ++++ .../authenticator/SingleSignOnSessionKey.java | 122 ++++++ java/org/apache/catalina/connector/Response.java | 63 ++- .../apache/catalina/core/LocalStrings.properties | 7 + java/org/apache/catalina/core/StandardContext.java | 14 +- .../apache/catalina/core/StandardHostValve.java | 2 +- .../catalina/filters/LocalStrings.properties | 1 + .../apache/catalina/filters/RemoteIpFilter.java | 60 ++- .../ha/authenticator/ClusterSingleSignOn.java | 379 ++++-------------- .../authenticator/ClusterSingleSignOnListener.java | 177 +-------- .../ha/authenticator/SingleSignOnMessage.java | 204 ---------- .../ha/authenticator/mbeans-descriptors.xml | 13 + .../catalina/ha/session/ClusterManagerBase.java | 14 + .../apache/catalina/ha/session/DeltaRequest.java | 37 +- .../apache/catalina/ha/session/DeltaSession.java | 64 +++- .../ha/session/ReplicatedSessionListener.java | 27 +- .../catalina/ha/session/mbeans-descriptors.xml | 14 +- java/org/apache/catalina/startup/HostConfig.java | 100 ++++- .../catalina/startup/LocalStrings.properties | 3 + java/org/apache/catalina/startup/TldConfig.java | 43 ++- .../tribes/tipis/AbstractReplicatedMap.java | 72 +++- .../catalina/tribes/tipis/LazyReplicatedMap.java | 5 + .../catalina/tribes/tipis/ReplicatedMap.java | 103 ++++- java/org/apache/catalina/util/Introspection.java | 8 +- .../org/apache/catalina/valves/AccessLogValve.java | 77 +++- .../apache/catalina/valves/LocalStrings.properties | 1 + java/org/apache/coyote/AbstractProcessor.java | 11 +- .../coyote/http11/AbstractHttp11Protocol.java | 2 +- java/org/apache/el/Messages.properties | 2 + java/org/apache/el/parser/AstValue.java | 34 +- java/org/apache/jasper/JspCompilationContext.java | 5 + .../apache/jasper/servlet/JspServletWrapper.java | 7 + java/org/apache/tomcat/jni/Buffer.java | 89 +++++ java/org/apache/tomcat/jni/Error.java | 4 +- java/org/apache/tomcat/jni/File.java | 22 +- java/org/apache/tomcat/jni/Global.java | 2 +- java/org/apache/tomcat/jni/Library.java | 4 +- java/org/apache/tomcat/jni/Lock.java | 4 +- java/org/apache/tomcat/jni/Multicast.java | 2 +- java/org/apache/tomcat/jni/Poll.java | 11 +- java/org/apache/tomcat/jni/Pool.java | 2 +- java/org/apache/tomcat/jni/Procattr.java | 10 +- java/org/apache/tomcat/jni/SSL.java | 8 +- java/org/apache/tomcat/jni/SSLContext.java | 41 +- java/org/apache/tomcat/jni/SSLSocket.java | 6 +- java/org/apache/tomcat/jni/Shm.java | 10 +- java/org/apache/tomcat/jni/Socket.java | 8 +- java/org/apache/tomcat/jni/Status.java | 2 +- java/org/apache/tomcat/jni/Stdlib.java | 4 +- .../org/apache/tomcat/jni/Thread.java | 27 +- java/org/apache/tomcat/jni/Time.java | 2 +- .../util/bcel/classfile/FastDataInputStream.java | 234 ------------ java/org/apache/tomcat/util/digester/Digester.java | 6 - .../org/apache/tomcat/util/http/CookieSupport.java | 15 + java/org/apache/tomcat/util/http/Cookies.java | 15 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 8 +- .../tomcat/websocket/LocalStrings.properties | 2 +- .../apache/tomcat/websocket/PerMessageDeflate.java | 54 ++- java/org/apache/tomcat/websocket/Util.java | 4 + .../org/apache/tomcat/websocket/WsFrameClient.java | 11 + .../server/WsRemoteEndpointImplServer.java | 3 +- .../jdbc/test/TestValidationQueryTimeout.java | 5 +- res/maven/mvn.properties.default | 2 +- .../apache/catalina/connector/TesterResponse.java | 31 ++ .../catalina/core/TestStandardHostValve.java | 48 +++ .../apache/catalina/filters/TestExpiresFilter.java | 1 - .../catalina/filters/TestRemoteIpFilter.java | 150 +++++++- ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 17 + .../startup/TestHostConfigAutomaticDeployment.java | 27 +- test/org/apache/el/TestMethodExpressionImpl.java | 49 +++ test/org/apache/el/TesterBeanB.java | 15 + webapps/docs/changelog.xml | 205 +++++++++- webapps/docs/config/ajp.xml | 4 +- webapps/docs/config/cluster-manager.xml | 9 +- webapps/docs/config/cluster-valve.xml | 26 +- webapps/docs/config/cluster.xml | 6 +- webapps/docs/config/http.xml | 12 +- webapps/docs/config/systemprops.xml | 10 + webapps/docs/config/valve.xml | 20 +- webapps/docs/security-howto.xml | 12 +- 86 files changed, 2059 insertions(+), 1497 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
