[tomcat7] 01/05: Merge tag 'upstream/7.0.57'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 3 23:29:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 162455cd31f1886840823c13e398abcb9107b487
Merge: ef26acb 030ebe9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 3 23:28:54 2014 +0100
Merge tag 'upstream/7.0.57'
Upstream version 7.0.57
BUILDING.txt | 4 +-
RELEASE-NOTES | 4 +-
build.properties.default | 6 +-
build.xml | 132 +++++--------
conf/server.xml | 1 +
java/javax/el/ELContext.java | 17 +-
java/javax/el/ELContextEvent.java | 5 +-
java/javax/el/ELResolver.java | 64 +++++-
java/javax/el/ExpressionFactory.java | 43 +++++
java/javax/el/MethodExpression.java | 32 +++
java/javax/el/ValueExpression.java | 64 ++++++
.../servlet/ServletContextAttributeListener.java | 9 +-
java/javax/servlet/ServletContextListener.java | 2 +
java/javax/servlet/ServletRegistration.java | 4 +-
java/javax/servlet/ServletRequest.java | 15 +-
.../servlet/ServletRequestAttributeListener.java | 43 +++--
java/javax/servlet/ServletRequestEvent.java | 6 +-
java/javax/servlet/ServletRequestListener.java | 36 ++--
java/javax/servlet/ServletRequestWrapper.java | 43 +++--
java/javax/servlet/jsp/JspApplicationContext.java | 9 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 31 ++-
java/javax/websocket/ContainerProvider.java | 2 +
java/javax/websocket/Endpoint.java | 6 +-
java/javax/websocket/PongMessage.java | 4 +-
java/javax/websocket/RemoteEndpoint.java | 80 ++++++--
java/javax/websocket/Session.java | 52 +++--
java/javax/websocket/WebSocketContainer.java | 41 ++--
java/javax/websocket/server/HandshakeRequest.java | 2 +
java/javax/websocket/server/ServerEndpoint.java | 2 +
.../websocket/server/ServerEndpointConfig.java | 1 +
.../authenticator/SpnegoAuthenticator.java | 44 ++++-
.../catalina/connector/ClientAbortException.java | 73 ++-----
.../ApplicationJspPropertyGroupDescriptor.java | 24 +--
.../apache/catalina/core/AprLifecycleListener.java | 35 ++--
.../apache/catalina/deploy/JspPropertyGroup.java | 6 +-
.../apache/catalina/ha/session/DeltaManager.java | 4 +-
java/org/apache/catalina/realm/JNDIRealm.java | 9 +
java/org/apache/catalina/startup/Catalina.java | 2 +-
java/org/apache/catalina/startup/HostConfig.java | 2 -
.../catalina/startup/LocalStrings.properties | 13 ++
.../catalina/startup/VersionLoggerListener.java | 116 +++++++++++
java/org/apache/catalina/websocket/Constants.java | 2 +-
.../apache/catalina/websocket/MessageInbound.java | 2 +-
.../apache/catalina/websocket/StreamInbound.java | 2 +-
.../catalina/websocket/WebSocketServlet.java | 2 +-
java/org/apache/catalina/websocket/WsFrame.java | 2 +-
.../websocket/WsHttpServletRequestWrapper.java | 2 +-
.../apache/catalina/websocket/WsInputStream.java | 2 +-
java/org/apache/catalina/websocket/WsOutbound.java | 2 +-
.../coyote/http11/filters/IdentityInputFilter.java | 4 +-
java/org/apache/jasper/compiler/Node.java | 21 +-
.../jasper/resources/LocalStrings.properties | 1 +
java/org/apache/tomcat/jni/SSL.java | 17 +-
java/org/apache/tomcat/jni/SSLContext.java | 14 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 4 +
.../tomcat/util/net/jsse/JSSESocketFactory.java | 132 +++++++------
.../util/net/jsse/res/LocalStrings.properties | 3 +
.../tomcat/websocket/AsyncChannelGroupUtil.java | 23 ++-
.../tomcat/websocket/LocalStrings.properties | 2 +
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 42 +++-
.../tomcat/websocket/WsWebSocketContainer.java | 7 +-
.../websocket/server/LocalStrings.properties | 2 +-
.../tomcat/websocket/server/UpgradeUtil.java | 4 +-
.../tomcat/websocket/server/WsServerContainer.java | 3 +-
modules/jdbc-pool/build.xml | 20 +-
modules/jdbc-pool/doc/package.xsl | 215 +--------------------
modules/jdbc-pool/resources/MANIFEST.MF | 2 -
res/maven/mvn.properties.default | 2 +-
.../apache/catalina/comet/TestCometProcessor.java | 16 +-
.../catalina/connector/TestCoyoteAdapter.java | 135 +++++++++++++
.../loader/TestWebappClassLoaderMemoryLeak.java | 6 +-
.../apache/catalina/startup/LoggingBaseTest.java | 9 +
.../apache/catalina/startup/SimpleHttpClient.java | 2 +-
test/org/apache/jasper/compiler/TestNode.java | 60 ++++--
.../{TestNode.java => TestNodeIntegration.java} | 4 +-
.../org/apache/juli/TestClassLoaderLogManager.java | 12 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 73 +------
.../tomcat/websocket/TestWsWebSocketContainer.java | 20 +-
.../websocket/pojo/TestEncodingDecoding.java | 32 +++
webapps/docs/changelog.xml | 178 ++++++++++++++++-
webapps/docs/class-loader-howto.xml | 2 +
webapps/docs/config/engine.xml | 6 +
webapps/docs/config/http.xml | 20 +-
webapps/docs/config/listeners.xml | 29 +++
webapps/docs/config/systemprops.xml | 16 +-
webapps/docs/index.xml | 4 +-
webapps/docs/project.xml | 2 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/web-socket-howto.xml | 4 +-
webapps/docs/windows-auth-howto.xml | 3 -
webapps/examples/WEB-INF/web.xml | 2 +-
webapps/examples/jsp/index.html | 57 ------
webapps/examples/{jsp => servlets}/chat/index.jsp | 0
webapps/examples/{jsp => servlets}/chat/login.jsp | 0
webapps/examples/{jsp => servlets}/chat/post.jsp | 0
webapps/examples/servlets/index.html | 61 +++++-
webapps/examples/websocket-deprecated/index.html | 2 +-
97 files changed, 1531 insertions(+), 848 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git
More information about the pkg-java-commits
mailing list