[tomcat7] 02/03: Merge tag 'upstream/7.0.63'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 8 10:55:24 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 994ec8867cf557bb53bc2e216d8543ead77d1fb8
Merge: e8fcee2 18cb8ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jul 8 12:15:08 2015 +0200
Merge tag 'upstream/7.0.63'
Upstream version 7.0.63
LICENSE | 2 +-
NOTICE | 8 +-
build.properties.default | 2 +-
build.xml | 6 +-
conf/web.xml | 49 +
java/javax/servlet/MultipartConfigElement.java | 8 +-
.../authenticator/SpnegoAuthenticator.java | 162 +
java/org/apache/catalina/connector/Request.java | 6 +-
java/org/apache/catalina/core/ContainerBase.java | 19 +-
java/org/apache/catalina/core/StandardContext.java | 5 +-
java/org/apache/catalina/filters/CorsFilter.java | 4 +-
java/org/apache/catalina/filters/FilterBase.java | 3 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 232 +
.../catalina/filters/LocalStrings.properties | 3 +
.../apache/catalina/filters/RemoteIpFilter.java | 5 +-
.../apache/catalina/ha/session/DeltaSession.java | 1 +
.../apache/catalina/loader/WebappClassLoader.java | 21 +-
.../tribes/tipis/AbstractReplicatedMap.java | 2 +-
.../catalina/tribes/tipis/LazyReplicatedMap.java | 10 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 38 +-
.../apache/catalina/valves/PersistentValve.java | 173 +-
java/org/apache/catalina/valves/SSLValve.java | 44 +-
java/org/apache/juli/FileHandler.java | 16 +-
.../apache/naming/resources/EmptyDirContext.java | 404 +
java/org/apache/tomcat/jni/SSL.java | 8 +
java/org/apache/tomcat/util/bcel/Constants.java | 6 +-
.../util/bcel/classfile/AnnotationEntry.java | 10 +-
.../tomcat/util/bcel/classfile/Annotations.java | 9 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 47 +-
.../tomcat/util/bcel/classfile/Constant.java | 22 +-
.../tomcat/util/bcel/classfile/ConstantLong.java | 4 +-
.../tomcat/util/bcel/classfile/ConstantPool.java | 10 +-
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 4 +-
.../tomcat/util/bcel/classfile/ElementValue.java | 128 +-
.../tomcat/util/bcel/classfile/JavaClass.java | 2 +-
.../apache/tomcat/util/bcel/classfile/Utility.java | 2 -
java/org/apache/tomcat/util/bcel/package.html | 2 +-
.../apache/tomcat/util/codec/DecoderException.java | 6 +-
.../apache/tomcat/util/codec/EncoderException.java | 6 +-
.../apache/tomcat/util/codec/binary/Base64.java | 45 +-
.../tomcat/util/codec/binary/BaseNCodec.java | 15 +-
.../tomcat/util/codec/binary/StringUtils.java | 13 +-
.../util/http/fileupload/FileUploadBase.java | 4 +-
.../tomcat/util/http/fileupload/IOUtils.java | 47 +
.../util/http/fileupload/ParameterParser.java | 22 +-
.../util/http/fileupload/disk/DiskFileItem.java | 12 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 84 +-
java/org/apache/tomcat/util/net/Constants.java | 11 +
java/org/apache/tomcat/util/net/NioChannel.java | 2 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 102 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 23 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 2 +-
.../tomcat/util/net/res/LocalStrings.properties | 3 +
.../tomcat/websocket/LocalStrings.properties | 3 +
.../apache/tomcat/websocket/PerMessageDeflate.java | 36 +-
.../tomcat/websocket/TransformationFactory.java | 5 +-
java/org/apache/tomcat/websocket/Util.java | 38 +-
.../org/apache/tomcat/websocket/WsFrameClient.java | 14 +-
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
.../tomcat/websocket/WsWebSocketContainer.java | 77 +-
.../websocket/server/LocalStrings.properties | 4 +-
.../tomcat/websocket/server/UpgradeUtil.java | 15 +-
.../tomcat/websocket/server/WsServerContainer.java | 15 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 18 +-
.../jdbc/pool/interceptor/SlowQueryReport.java | 74 +-
res/INSTALLLICENSE | 2 +-
res/maven/mvn.properties.default | 2 +-
test/javax/el/TestBeanELResolver.java | 1 -
test/javax/servlet/http/TestHttpServlet.java | 7 +-
.../authenticator/TestDigestAuthenticator.java | 5 +-
.../authenticator/TestFormAuthenticator.java | 4 +-
.../TestNonLoginAndBasicAuthenticator.java | 10 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 10 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 10 +-
.../apache/catalina/comet/TestCometProcessor.java | 15 +-
.../apache/catalina/connector/TestConnector.java | 3 +-
.../catalina/connector/TestCoyoteAdapter.java | 20 +-
.../apache/catalina/connector/TestInputBuffer.java | 3 +-
.../catalina/connector/TestKeepAliveCount.java | 3 +-
.../catalina/connector/TestMaxConnections.java | 3 +-
.../catalina/connector/TestOutputBuffer.java | 6 +-
.../org/apache/catalina/connector/TestRequest.java | 38 +-
.../apache/catalina/connector/TestResponse.java | 16 +-
.../catalina/core/TestApplicationContext.java | 6 +-
.../catalina/core/TestApplicationFilterConfig.java | 5 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 118 +-
.../catalina/core/TestNamingContextListener.java | 10 +-
.../apache/catalina/core/TestStandardContext.java | 10 +-
.../catalina/core/TestStandardContextValve.java | 11 +-
.../catalina/core/TestStandardHostValve.java | 5 +-
.../apache/catalina/core/TestStandardWrapper.java | 20 +-
.../catalina/filters/TestAddCharSetFilter.java | 5 +-
.../catalina/ha/context/TestReplicatedContext.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 5 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 5 +-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 10 +-
.../catalina/session/TestPersistentManager.java | 5 +-
.../catalina/session/TestStandardSession.java | 4 +-
.../apache/catalina/startup/SimpleHttpClient.java | 5 +
test/org/apache/catalina/startup/TestListener.java | 8 +-
test/org/apache/catalina/startup/TestTomcat.java | 25 +-
.../catalina/startup/TestTomcatClassLoader.java | 10 +-
.../catalina/valves/TestErrorReportValve.java | 27 +-
.../apache/catalina/websocket/TestWebSocket.java | 30 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 20 +-
.../coyote/http11/TestAbstractHttp11Processor.java | 122 +-
.../http11/filters/TestChunkedInputFilter.java | 25 +-
.../apache/naming/resources/TestNamingContext.java | 33 +-
.../naming/resources/TestProxyDirContext.java | 5 +-
.../apache/tomcat/util/http/CookiesBaseTest.java | 5 +-
test/org/apache/tomcat/util/http/TestBug49158.java | 5 +-
.../tomcat/util/http/mapper/TestMapperWebapps.java | 5 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 17 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 11 +-
.../websocket/TestWebSocketFrameClientSSL.java | 10 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 5 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 5 +-
.../tomcat/websocket/TestWsSubprotocols.java | 5 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 133 +-
.../websocket/pojo/TestEncodingDecoding.java | 18 +-
.../websocket/pojo/TestPojoEndpointBase.java | 10 +-
.../websocket/pojo/TestPojoMethodMapping.java | 5 +-
.../websocket/server/TestWsServerContainer.java | 5 +-
webapps/docs/architecture/requestProcess.xml | 9 +-
.../requestProcess/authentication-process.png | Bin 0 -> 42682 bytes
.../requestProcess/request-process.png | Bin 0 -> 109471 bytes
.../architecture/requestProcess/requestProcess.pdf | Bin 32424 -> 0 bytes
.../docs/architecture/requestProcess/roseModel.mdl | 12921 -------------------
.../docs/architecture/startup/serverStartup.txt | 23 +-
webapps/docs/changelog.xml | 194 +-
webapps/docs/config/ajp.xml | 2 +-
webapps/docs/config/cluster-membership.xml | 3 +-
webapps/docs/config/filter.xml | 80 +
webapps/docs/config/http.xml | 28 +-
webapps/docs/config/valve.xml | 35 +
webapps/docs/security-howto.xml | 7 +
137 files changed, 2500 insertions(+), 13907 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