[tomcat7] 01/03: Merge tag 'upstream/7.0.64'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Aug 28 08:19:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat7.
commit 6a5186ec0188e0ca4d7a0a8f796de88eaec5046a
Merge: ee7f946 4250255
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Aug 28 09:42:13 2015 +0200
Merge tag 'upstream/7.0.64'
Upstream version 7.0.64
build.properties.default | 2 +-
build.xml | 2 +-
java/org/apache/catalina/Globals.java | 7 +
java/org/apache/catalina/ant/DeployTask.java | 26 +-
java/org/apache/catalina/ant/ValidatorTask.java | 12 +-
java/org/apache/catalina/connector/Request.java | 45 ++-
.../apache/catalina/core/ApplicationContext.java | 10 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 125 +++---
java/org/apache/catalina/core/StandardContext.java | 16 +-
.../catalina/filters/FailedRequestFilter.java | 38 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 28 +-
.../catalina/ha/deploy/LocalStrings.properties | 1 +
.../apache/catalina/loader/LocalStrings.properties | 5 +
.../apache/catalina/loader/WebappClassLoader.java | 234 ++++++++++-
.../org/apache/catalina/security/SecurityUtil.java | 22 +-
.../org/apache/catalina/valves/AccessLogValve.java | 3 +-
java/org/apache/coyote/AbstractProtocol.java | 5 +
java/org/apache/coyote/AsyncStateMachine.java | 51 ++-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 4 +
.../coyote/http11/AbstractHttp11Protocol.java | 3 +-
.../apache/coyote/http11/Http11NioProtocol.java | 4 +
.../apache/jasper/compiler/ErrorDispatcher.java | 3 +-
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
java/org/apache/jasper/el/ELContextImpl.java | 2 +-
.../apache/jasper/runtime/JspContextWrapper.java | 85 +++-
.../org/apache/jasper/runtime/PageContextImpl.java | 12 +-
.../apache/tomcat/InstrumentableClassLoader.java | 79 ++++
java/org/apache/tomcat/jni/Socket.java | 11 +-
java/org/apache/tomcat/util/http/Parameters.java | 46 ++-
java/org/apache/tomcat/util/http/RequestUtil.java | 45 ++-
.../apache/tomcat/util/net/AbstractEndpoint.java | 3 +
java/org/apache/tomcat/util/net/AprEndpoint.java | 8 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 6 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 62 +--
java/org/apache/tomcat/util/net/SocketWrapper.java | 5 +-
java/org/apache/tomcat/websocket/Util.java | 8 +-
.../tomcat/websocket/WsWebSocketContainer.java | 2 +-
.../tomcat/websocket/pojo/PojoEndpointClient.java | 3 +-
.../tomcat/websocket/pojo/PojoMethodMapping.java | 7 +-
.../tomcat/websocket/server/WsServerContainer.java | 17 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 5 +-
.../apache/tomcat/jdbc/pool/ConnectionPool.java | 11 +-
.../pool/interceptor/QueryTimeoutInterceptor.java | 5 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 29 +-
.../eclipse/eclipse-websocket.classpath | 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/maven/mvn.properties.default | 2 +-
test/deployment/context.jar | Bin 0 -> 489 bytes
test/deployment/dir with spaces/context.jar | Bin 0 -> 489 bytes
test/deployment/dir with spaces/context.war | Bin 0 -> 565 bytes
test/org/apache/catalina/ant/TestDeployTask.java | 118 ++++++
.../org/apache/catalina/connector/TestRequest.java | 6 +-
.../catalina/loader/TestWebappClassLoader.java | 51 +++
.../loader/TestWebappClassLoaderWeaving.java | 429 +++++++++++++++++++++
.../catalina/loader/TesterNeverWeavedClass.java | 24 ++
.../catalina/loader/TesterUnweavedClass.java | 24 ++
.../jasper/runtime/TestJspContextWrapper.java | 58 +++
.../apache/tomcat/util/http/TestRequestUtil.java | 70 +++-
.../websocket/server/TestWsServerContainer.java | 53 +++
.../classes/org/apache/tomcat/Bug58096.class | Bin 0 -> 285 bytes
.../classes/org/apache/tomcat/Bug58096.java} | 21 +-
.../webapp-3.0/WEB-INF/tags/bug58178.tag | 29 +-
test/webapp-3.0/bug5nnnn/bug58096.jsp | 17 +
test/webapp-3.0/bug5nnnn/bug58178.jsp | 30 ++
webapps/docs/building.xml | 2 +-
webapps/docs/changelog.xml | 186 ++++++++-
webapps/docs/cluster-howto.xml | 8 +-
webapps/docs/config/cluster-deployer.xml | 2 +-
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/cluster-sender.xml | 2 +-
webapps/docs/config/executor.xml | 2 +-
webapps/docs/config/filter.xml | 2 +-
webapps/docs/config/host.xml | 2 +-
webapps/docs/config/http.xml | 9 +-
webapps/docs/config/listeners.xml | 8 +-
webapps/docs/config/sessionidgenerator.xml | 2 +-
webapps/docs/config/systemprops.xml | 2 +-
webapps/docs/config/valve.xml | 59 ++-
webapps/docs/funcspecs/fs-default.xml | 2 +-
webapps/docs/funcspecs/fs-jdbc-realm.xml | 2 +-
webapps/docs/funcspecs/fs-jndi-realm.xml | 2 +-
webapps/docs/funcspecs/fs-memory-realm.xml | 2 +-
webapps/docs/index.xml | 2 +-
webapps/docs/jasper-howto.xml | 4 +-
webapps/docs/jndi-datasource-examples-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 8 +-
webapps/docs/logging.xml | 2 +-
webapps/docs/manager-howto.xml | 35 +-
webapps/docs/monitoring.xml | 8 +-
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/security-howto.xml | 2 +-
webapps/docs/ssi-howto.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 +-
webapps/docs/tribes/introduction.xml | 2 +-
94 files changed, 2046 insertions(+), 358 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