[tomcat7] 01/02: Merge tag 'upstream/7.0.59'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Feb 10 22:15:30 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 577511d3652ac7537d882137760b42b51a1df18b
Merge: b3158d3 199d93d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Feb 10 22:34:17 2015 +0100
Merge tag 'upstream/7.0.59'
Upstream version 7.0.59
BUILDING.txt | 4 +-
NOTICE | 2 +-
build.properties.default | 8 +-
build.xml | 221 ++++-----
conf/web.xml | 3 +-
java/javax/el/BeanELResolver.java | 30 +-
java/javax/el/ExpressionFactory.java | 19 +-
java/javax/servlet/http/LocalStrings.properties | 2 +-
java/org/apache/catalina/SessionIdGenerator.java | 59 +++
.../ant/ThreaddumpTask.java} | 40 +-
.../ant/VminfoTask.java} | 40 +-
java/org/apache/catalina/ant/antlib.xml | 6 +
.../catalina/authenticator/AuthenticatorBase.java | 7 +-
.../catalina/connector/LocalStrings.properties | 3 +-
java/org/apache/catalina/connector/Request.java | 76 +++-
java/org/apache/catalina/connector/Response.java | 4 +-
.../apache/catalina/core/ApplicationContext.java | 54 ++-
.../org/apache/catalina/core/AsyncContextImpl.java | 26 +-
.../apache/catalina/core/LocalStrings.properties | 6 +-
.../catalina/core/LocalStrings_es.properties | 1 -
.../catalina/core/LocalStrings_fr.properties | 1 -
.../catalina/core/LocalStrings_ja.properties | 1 -
java/org/apache/catalina/core/StandardContext.java | 64 ++-
.../apache/catalina/core/StandardHostValve.java | 65 +--
java/org/apache/catalina/filters/CorsFilter.java | 12 +-
.../org/apache/catalina/filters/ExpiresFilter.java | 3 +-
java/org/apache/catalina/ha/ClusterRuleSet.java | 8 +-
.../ha/authenticator/ClusterSingleSignOn.java | 31 +-
.../ha/authenticator/mbeans-descriptors.xml | 7 +-
.../catalina/ha/context/ReplicatedContext.java | 15 +-
.../catalina/ha/deploy/LocalStrings.properties | 6 +
java/org/apache/catalina/ha/deploy/WarWatcher.java | 24 +-
.../catalina/ha/session/ClusterManagerBase.java | 14 +-
java/org/apache/catalina/manager/Constants.java | 2 +-
.../catalina/manager/HTMLManagerServlet.java | 2 +-
.../catalina/manager/LocalStrings.properties | 3 +-
.../apache/catalina/manager/ManagerServlet.java | 44 +-
.../apache/catalina/manager/host/Constants.java | 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 46 +-
.../apache/catalina/realm/mbeans-descriptors.xml | 18 +-
.../org/apache/catalina/security/SecurityUtil.java | 59 ++-
java/org/apache/catalina/servlets/CGIServlet.java | 2 +-
java/org/apache/catalina/session/ManagerBase.java | 94 +++-
.../org/apache/catalina/startup/ContextConfig.java | 30 +-
.../apache/catalina/startup/ContextRuleSet.java | 8 +
.../catalina/startup/LocalStrings.properties | 5 +-
java/org/apache/catalina/startup/Tomcat.java | 66 ++-
.../catalina/startup/VersionLoggerListener.java | 32 +-
.../tribes/tipis/AbstractReplicatedMap.java | 4 +-
.../apache/catalina/util/LocalStrings.properties | 8 +-
.../catalina/util/LocalStrings_es.properties | 2 +-
.../catalina/util/LocalStrings_fr.properties | 2 +-
.../catalina/util/LocalStrings_ja.properties | 2 +-
...dGenerator.java => SessionIdGeneratorBase.java} | 133 +++---
.../catalina/util/StandardSessionIdGenerator.java | 64 +++
.../apache/catalina/valves/ErrorReportValve.java | 10 +-
.../apache/catalina/valves/RemoteAddrValve.java | 41 +-
.../apache/catalina/valves/RemoteHostValve.java | 41 +-
.../apache/catalina/valves/RequestFilterValve.java | 43 ++
.../apache/catalina/valves/mbeans-descriptors.xml | 30 +-
java/org/apache/coyote/ActionCode.java | 33 +-
java/org/apache/coyote/AsyncStateMachine.java | 86 +++-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 4 +
java/org/apache/coyote/ajp/AjpNioProcessor.java | 8 +-
.../coyote/http11/AbstractHttp11Processor.java | 37 +-
.../apache/coyote/http11/Http11NioProcessor.java | 16 +-
.../coyote/http11/InternalNioInputBuffer.java | 2 +-
.../coyote/http11/InternalNioOutputBuffer.java | 4 +-
.../http11/upgrade/NioServletInputStream.java | 2 +-
.../http11/upgrade/NioServletOutputStream.java | 4 +-
.../coyote/http11/upgrade/UpgradeNioProcessor.java | 6 +-
java/org/apache/jasper/JspC.java | 40 +-
java/org/apache/jasper/compiler/AntCompiler.java | 11 +-
.../apache/jasper/compiler/JspRuntimeContext.java | 5 +-
.../org/apache/jasper/runtime/PageContextImpl.java | 34 +-
.../apache/jasper/security/SecurityClassLoad.java | 2 -
.../apache/jasper/servlet/JspCServletContext.java | 12 +-
java/org/apache/juli/ClassLoaderLogManager.java | 6 +-
.../naming/resources/DirContextURLConnection.java | 8 +-
java/org/apache/tomcat/jni/Library.java | 5 +-
java/org/apache/tomcat/util/Diagnostics.java | 495 +++++++++++++++++++++
.../org/apache/tomcat/util/IntrospectionUtils.java | 6 +-
.../org/apache/tomcat/util/LocalStrings.properties | 31 ++
.../tomcat/util/bcel/classfile/ClassParser.java | 4 +-
java/org/apache/tomcat/util/buf/UDecoder.java | 2 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 71 ++-
java/org/apache/tomcat/util/net/NioChannel.java | 3 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 52 ++-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 2 +-
.../tomcat/websocket/AsyncChannelGroupUtil.java | 45 +-
.../tomcat/websocket/CaseInsensitiveKeyMap.java | 208 +++++++++
java/org/apache/tomcat/websocket/Constants.java | 42 +-
.../tomcat/websocket/LocalStrings.properties | 10 +-
.../tomcat/websocket/TransformationFactory.java | 8 +-
java/org/apache/tomcat/websocket/Util.java | 95 ++--
.../tomcat/websocket/WsHandshakeResponse.java | 15 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 107 +++--
java/org/apache/tomcat/websocket/WsSession.java | 38 +-
.../tomcat/websocket/WsWebSocketContainer.java | 30 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 2 +-
.../tomcat/websocket/pojo/PojoMethodMapping.java | 192 ++++++--
.../tomcat/websocket/server/UpgradeUtil.java | 14 +-
.../websocket/server/WsHandshakeRequest.java | 11 +-
modules/jdbc-pool/NOTICE | 2 +-
res/maven/mvn.properties.default | 2 +-
test/javax/el/TestResourceBundleELResolver.java | 16 +-
.../apache/catalina/comet/TestCometProcessor.java | 7 +-
.../catalina/connector/TestCoyoteAdapter.java | 4 +-
.../org/apache/catalina/connector/TestRequest.java | 37 ++
.../catalina/core/TestApplicationContext.java | 95 ++++
.../apache/catalina/core/TestAsyncContextImpl.java | 224 +++++++++-
.../apache/catalina/core/TestStandardContext.java | 21 +-
.../apache/catalina/core/TesterTldListener.java | 16 +-
.../apache/catalina/filters/TestCorsFilter.java | 74 ++-
.../catalina/filters/TesterFilterConfigs.java | 18 +
.../catalina/ha/context/TestReplicatedContext.java | 73 +++
test/org/apache/catalina/startup/TestListener.java | 4 +-
test/org/apache/catalina/startup/TestTomcat.java | 115 ++++-
.../apache/catalina/startup/TomcatBaseTest.java | 388 ++++++++++++++++
.../catalina/valves/TestRequestFilterValve.java | 352 +++++++++++++++
test/org/apache/coyote/ajp/SimpleAjpClient.java | 214 ++++++++-
.../coyote/ajp/TestAbstractAjpProcessor.java | 454 ++++++++++++++++++-
test/org/apache/coyote/ajp/TesterAjpMessage.java | 44 ++
.../coyote/http11/TestAbstractHttp11Processor.java | 57 +++
.../org/apache/juli/TestClassLoaderLogManager.java | 30 +-
.../apache/tomcat/util/bcel/TesterPerformance.java | 28 +-
test/org/apache/tomcat/util/buf/TestUEncoder.java | 27 ++
test/org/apache/tomcat/util/buf/TestUtf8.java | 64 ++-
.../tomcat/websocket/TesterFirehoseServer.java | 8 +-
webapps/docs/architecture/overview.xml | 2 +-
webapps/docs/building.xml | 163 +++++--
webapps/docs/cgi-howto.xml | 40 +-
webapps/docs/changelog.xml | 372 +++++++++++++++-
webapps/docs/config/ajp.xml | 2 +
webapps/docs/config/cluster-manager.xml | 19 +-
webapps/docs/config/cluster-valve.xml | 33 ++
webapps/docs/config/context.xml | 55 +--
webapps/docs/config/filter.xml | 71 ++-
webapps/docs/config/http.xml | 9 +
webapps/docs/config/listeners.xml | 6 +
webapps/docs/config/manager.xml | 25 +-
webapps/docs/config/project.xml | 1 +
webapps/docs/config/realm.xml | 10 +
webapps/docs/config/sessionidgenerator.xml | 131 ++++++
webapps/docs/config/systemprops.xml | 41 ++
webapps/docs/config/valve.xml | 86 +++-
webapps/docs/html-manager-howto.xml | 13 +-
webapps/docs/index.xml | 7 +-
webapps/docs/manager-howto.xml | 458 ++++++++++++-------
webapps/docs/project.xml | 2 +-
webapps/docs/security-howto.xml | 6 +
webapps/docs/ssl-howto.xml | 180 ++++----
webapps/docs/tomcat-docs.xsl | 21 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +-
155 files changed, 6275 insertions(+), 1319 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