[tomcat7] branch master updated (ee7f946 -> 3cd5015)
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 change to branch master
in repository tomcat7.
from ee7f946 Install the missing WebSocket jars in /usr/share/tomcat7/lib/ (Closes: #787220, LP: #1326687)
adds 4250255 Imported Upstream version 7.0.64
new 6a5186e Merge tag 'upstream/7.0.64'
new 16910c5 Refreshed the patches
new 3cd5015 Upload to unstable
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties.default | 2 +-
build.xml | 2 +-
debian/changelog | 6 +-
debian/patches/0017-use-jdbc-pool-default.patch | 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
test/org/apache/catalina/ant/TestDeployTask.java | 118 ++++++
.../org/apache/catalina/connector/TestRequest.java | 6 +-
.../catalina/loader/TestWebappClassLoader.java} | 25 +-
.../loader/TestWebappClassLoaderWeaving.java | 429 +++++++++++++++++++++
.../catalina/loader/TesterNeverWeavedClass.java | 8 +-
.../catalina/loader/TesterUnweavedClass.java | 8 +-
.../jasper/runtime/TestJspContextWrapper.java} | 26 +-
.../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 | 11 +-
.../webapp-3.0/WEB-INF/tags/bug58178.tag | 23 +-
.../bug5nnnn/{bug57601.jsp => bug58096.jsp} | 5 +-
.../bug5nnnn/{bug55642a.jsp => bug58178.jsp} | 21 +-
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 +-
96 files changed, 1899 insertions(+), 386 deletions(-)
create mode 100644 java/org/apache/tomcat/InstrumentableClassLoader.java
create mode 100644 test/deployment/context.jar
create mode 100644 test/deployment/dir with spaces/context.jar
copy test/deployment/{ => dir with spaces}/context.war (100%)
create mode 100644 test/org/apache/catalina/ant/TestDeployTask.java
copy test/{javax/servlet/jsp/TestPageContext.java => org/apache/catalina/loader/TestWebappClassLoader.java} (62%)
create mode 100644 test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
copy java/org/apache/coyote/http11/upgrade/Constants.java => test/org/apache/catalina/loader/TesterNeverWeavedClass.java (83%)
copy java/org/apache/coyote/http11/upgrade/Constants.java => test/org/apache/catalina/loader/TesterUnweavedClass.java (84%)
copy test/{javax/el/TestCompositeELResolver.java => org/apache/jasper/runtime/TestJspContextWrapper.java} (70%)
create mode 100644 test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.class
copy java/org/apache/tomcat/PeriodicEventListener.java => test/webapp-3.0/WEB-INF/classes/org/apache/tomcat/Bug58096.java (85%)
copy webapps/examples/jsp/error/errorpge.jsp => test/webapp-3.0/WEB-INF/tags/bug58178.tag (69%)
copy test/webapp-3.0/bug5nnnn/{bug57601.jsp => bug58096.jsp} (89%)
copy test/webapp-3.0/bug5nnnn/{bug55642a.jsp => bug58178.jsp} (67%)
--
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