[tomcat7] 01/03: Merge tag 'upstream/7.0.56'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 6 09:03:58 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 57a057ddc3d4c3ad840411e3ee2384afecf9f8ce
Merge: adac2a8 6c55a33
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Sep 26 14:03:28 2014 +0200
Merge tag 'upstream/7.0.56'
Upstream version 7.0.56
BUILDING.txt | 6 +
bin/catalina.bat | 4 +-
bin/setclasspath.bat | 13 +-
bin/setclasspath.sh | 12 +-
build.properties.default | 9 +-
build.xml | 32 +-
java/javax/el/Util.java | 36 +-
java/javax/websocket/Session.java | 48 +-
.../catalina/authenticator/AuthenticatorBase.java | 37 +-
.../authenticator/DigestAuthenticator.java | 4 +-
.../catalina/authenticator/SSLAuthenticator.java | 23 +-
.../apache/catalina/connector/CoyoteAdapter.java | 17 +-
java/org/apache/catalina/connector/Request.java | 33 +-
java/org/apache/catalina/connector/Response.java | 54 +-
.../catalina/core/ApplicationContextFacade.java | 17 +-
.../catalina/core/DefaultInstanceManager.java | 80 +--
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 4 +-
.../apache/catalina/core/StandardHostValve.java | 64 +-
java/org/apache/catalina/deploy/WebXml.java | 2 +-
.../apache/catalina/manager/ManagerServlet.java | 9 +-
java/org/apache/catalina/realm/JNDIRealm.java | 8 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
.../apache/catalina/servlets/DefaultServlet.java | 47 +-
.../apache/catalina/servlets/WebdavServlet.java | 2 +-
.../catalina/session/PersistentManagerBase.java | 2 +-
.../catalina/startup/CatalinaProperties.java | 10 +-
.../org/apache/catalina/startup/ContextConfig.java | 142 ++--
java/org/apache/catalina/startup/HostConfig.java | 7 +-
.../apache/catalina/tribes/group/RpcChannel.java | 3 +-
.../tribes/tipis/AbstractReplicatedMap.java | 14 +-
.../tribes/transport/bio/MultipointBioSender.java | 3 +-
.../tribes/transport/nio/ParallelNioSender.java | 3 +-
java/org/apache/catalina/util/CharsetMapper.java | 13 +-
.../apache/catalina/util/ExtensionValidator.java | 23 +-
java/org/apache/catalina/util/ServerInfo.java | 16 +-
.../apache/catalina/valves/ErrorReportValve.java | 10 +-
.../catalina/valves/ExtendedAccessLogValve.java | 4 +-
.../catalina/valves/StuckThreadDetectionValve.java | 4 +
.../apache/catalina/valves/mbeans-descriptors.xml | 5 +
java/org/apache/coyote/AsyncStateMachine.java | 5 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 1 +
java/org/apache/coyote/ajp/AjpNioProtocol.java | 1 +
java/org/apache/el/util/ReflectionUtil.java | 25 +-
java/org/apache/jasper/Constants.java | 5 +-
java/org/apache/jasper/JspC.java | 4 +
java/org/apache/jasper/compiler/Compiler.java | 12 +-
java/org/apache/jasper/compiler/JDTCompiler.java | 15 +-
java/org/apache/jasper/el/JasperELResolver.java | 2 +-
java/org/apache/jasper/servlet/JspServlet.java | 11 +-
.../apache/jasper/servlet/JspServletWrapper.java | 4 +-
.../apache/naming/resources/BaseDirContext.java | 72 +-
java/org/apache/tomcat/util/bcel/Constants.java | 476 -------------
.../util/bcel/classfile/AnnotationDefault.java | 87 ---
.../bcel/classfile/AnnotationElementValue.java | 20 +-
.../util/bcel/classfile/AnnotationEntry.java | 50 +-
.../tomcat/util/bcel/classfile/Annotations.java | 47 +-
.../util/bcel/classfile/ArrayElementValue.java | 33 +-
.../tomcat/util/bcel/classfile/Attribute.java | 233 -------
.../util/bcel/classfile/AttributeReader.java | 56 --
.../util/bcel/classfile/ClassElementValue.java | 15 +-
.../util/bcel/classfile/ClassFormatException.java | 4 -
.../tomcat/util/bcel/classfile/ClassParser.java | 197 +++---
.../apache/tomcat/util/bcel/classfile/Code.java | 240 -------
.../tomcat/util/bcel/classfile/CodeException.java | 127 ----
.../tomcat/util/bcel/classfile/Constant.java | 97 +--
.../tomcat/util/bcel/classfile/ConstantCP.java | 86 ---
.../tomcat/util/bcel/classfile/ConstantClass.java | 23 +-
.../tomcat/util/bcel/classfile/ConstantDouble.java | 24 +-
.../util/bcel/classfile/ConstantFieldref.java | 44 --
.../tomcat/util/bcel/classfile/ConstantFloat.java | 24 +-
.../util/bcel/classfile/ConstantInteger.java | 24 +-
.../bcel/classfile/ConstantInterfaceMethodref.java | 44 --
.../util/bcel/classfile/ConstantInvokeDynamic.java | 95 ---
.../tomcat/util/bcel/classfile/ConstantLong.java | 24 +-
.../util/bcel/classfile/ConstantMethodHandle.java | 93 ---
.../util/bcel/classfile/ConstantMethodType.java | 80 ---
.../util/bcel/classfile/ConstantMethodref.java | 44 --
.../util/bcel/classfile/ConstantNameAndType.java | 87 ---
.../tomcat/util/bcel/classfile/ConstantPool.java | 184 +----
.../tomcat/util/bcel/classfile/ConstantString.java | 74 --
.../tomcat/util/bcel/classfile/ConstantUtf8.java | 59 +-
.../tomcat/util/bcel/classfile/ConstantValue.java | 108 ---
.../tomcat/util/bcel/classfile/Deprecated.java | 92 ---
.../tomcat/util/bcel/classfile/ElementValue.java | 27 +-
.../util/bcel/classfile/ElementValuePair.java | 21 +-
.../util/bcel/classfile/EnclosingMethod.java | 46 --
.../util/bcel/classfile/EnumElementValue.java | 21 +-
.../tomcat/util/bcel/classfile/ExceptionTable.java | 118 ----
.../util/bcel/classfile/FastDataInputStream.java | 234 +++++++
.../apache/tomcat/util/bcel/classfile/Field.java | 130 ----
.../tomcat/util/bcel/classfile/FieldOrMethod.java | 106 ---
.../tomcat/util/bcel/classfile/InnerClass.java | 132 ----
.../tomcat/util/bcel/classfile/InnerClasses.java | 109 ---
.../tomcat/util/bcel/classfile/JavaClass.java | 257 +------
.../tomcat/util/bcel/classfile/LineNumber.java | 91 ---
.../util/bcel/classfile/LineNumberTable.java | 119 ----
.../tomcat/util/bcel/classfile/LocalVariable.java | 141 ----
.../util/bcel/classfile/LocalVariableTable.java | 128 ----
.../bcel/classfile/LocalVariableTypeTable.java | 111 ---
.../apache/tomcat/util/bcel/classfile/Method.java | 174 -----
.../tomcat/util/bcel/classfile/PMGClass.java | 103 ---
.../bcel/classfile/ParameterAnnotationEntry.java | 50 --
.../util/bcel/classfile/ParameterAnnotations.java | 79 ---
.../classfile/RuntimeInvisibleAnnotations.java | 63 --
.../RuntimeInvisibleParameterAnnotations.java | 58 --
.../bcel/classfile/RuntimeVisibleAnnotations.java | 63 --
.../RuntimeVisibleParameterAnnotations.java | 58 --
.../tomcat/util/bcel/classfile/Signature.java | 90 ---
.../util/bcel/classfile/SimpleElementValue.java | 38 +-
.../tomcat/util/bcel/classfile/SourceFile.java | 99 ---
.../tomcat/util/bcel/classfile/StackMap.java | 116 ---
.../tomcat/util/bcel/classfile/StackMapEntry.java | 138 ----
.../tomcat/util/bcel/classfile/StackMapTable.java | 116 ---
.../util/bcel/classfile/StackMapTableEntry.java | 211 ------
.../tomcat/util/bcel/classfile/StackMapType.java | 141 ----
.../tomcat/util/bcel/classfile/Synthetic.java | 102 ---
.../apache/tomcat/util/bcel/classfile/Unknown.java | 128 ----
.../apache/tomcat/util/bcel/classfile/Utility.java | 776 +--------------------
.../apache/tomcat/util/bcel/util/ByteSequence.java | 57 --
java/org/apache/tomcat/util/bcel/util/package.html | 38 -
java/org/apache/tomcat/util/file/Matcher.java | 33 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 22 +
.../tomcat/util/net/NioBlockingSelector.java | 4 +-
.../tomcat/util/net/jsse/JSSESocketFactory.java | 12 +-
.../tomcat/util/net/res/LocalStrings.properties | 2 +
.../util/security}/ConcurrentMessageDigest.java | 21 +-
.../util => tomcat/util/security}/MD5Encoder.java | 2 +-
.../tomcat/util/threads/ThreadPoolExecutor.java | 13 +-
.../websocket/AsyncChannelWrapperSecure.java | 3 +-
java/org/apache/tomcat/websocket/Constants.java | 13 +
.../tomcat/websocket/LocalStrings.properties | 12 +-
java/org/apache/tomcat/websocket/MessagePart.java | 76 ++
.../apache/tomcat/websocket/PerMessageDeflate.java | 439 ++++++++++++
.../apache/tomcat/websocket/Transformation.java | 97 +++
.../tomcat/websocket/TransformationFactory.java | 45 +-
.../tomcat/websocket/TransformationResult.java | 22 +-
java/org/apache/tomcat/websocket/Util.java | 93 ++-
.../WsExtension.java} | 55 +-
.../WsExtensionParameter.java} | 33 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 239 +++++--
.../org/apache/tomcat/websocket/WsFrameClient.java | 6 +-
.../tomcat/websocket/WsRemoteEndpointImplBase.java | 124 ++--
.../websocket/WsRemoteEndpointImplClient.java | 8 +-
java/org/apache/tomcat/websocket/WsSession.java | 37 +-
.../tomcat/websocket/WsWebSocketContainer.java | 26 +-
.../tomcat/websocket/pojo/PojoEndpointClient.java | 2 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 20 +
.../pojo/PojoMessageHandlerPartialBase.java | 6 +-
.../pojo/PojoMessageHandlerPartialBinary.java | 2 +-
.../pojo/PojoMessageHandlerPartialText.java | 2 +-
.../pojo/PojoMessageHandlerWholeBase.java | 6 +-
.../server/DefaultServerEndpointConfigurator.java | 9 +-
.../websocket/server/LocalStrings.properties | 2 +-
.../tomcat/websocket/server/UpgradeUtil.java | 150 +++-
.../tomcat/websocket/server/WsFrameServer.java | 13 +-
.../websocket/server/WsHttpUpgradeHandler.java | 23 +-
.../server/WsRemoteEndpointImplServer.java | 9 +
.../tomcat/websocket/server/WsServerContainer.java | 45 +-
modules/jdbc-pool/doc/changelog.xml | 18 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
.../apache/tomcat/jdbc/pool/FairBlockingQueue.java | 30 +-
.../java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 177 +++++
res/META-INF/websocket-api.jar.manifest | 8 +-
res/checkstyle/checkstyle.xml | 2 +-
.../eclipse/eclipse-websocket.classpath | 16 +-
res/ide-support/eclipse/eclipse-websocket.project | 46 ++
...org.eclipse.jdt.core.prefs-websocket.properties | 20 +
.../eclipse/org.eclipse.jdt.core.prefs.properties | 20 +
res/maven/mvn.properties.default | 2 +-
res/tomcat.nsi | 2 +
.../authenticator/TestDigestAuthenticator.java | 4 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 4 +-
.../TesterDigestAuthenticatorPerformance.java | 4 +-
.../org/apache/catalina/connector/TestRequest.java | 37 +-
.../apache/catalina/connector/TesterRequest.java | 34 +
.../apache/catalina/core/TestAsyncContextImpl.java | 11 +-
.../apache/catalina/core/TestStandardContext.java | 13 +
test/org/apache/el/TestMethodExpressionImpl.java | 18 +
test/org/apache/el/TesterBeanA.java | 8 +
test/org/apache/el/TesterBeanAA.java | 12 +-
.../org/apache/jasper/el/TestJasperELResolver.java | 1 -
.../apache/jasper/runtime/TestPageContextImpl.java | 32 +
.../apache/tomcat/util/bcel/TesterPerformance.java | 72 ++
.../apache/tomcat/util/http/mapper/TestMapper.java | 127 +++-
.../tomcat/util/http/mapper/TestMapperWebapps.java | 51 +-
.../org/apache/tomcat/util/net/TestClientCert.java | 35 +-
test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 9 +-
test/org/apache/tomcat/websocket/TestUtil.java | 110 ++-
.../websocket/pojo/TestEncodingDecoding.java | 9 +-
test/webapp-3.0/jsp/pageContext1.jsp | 39 ++
.../webapp-3.0/jsp/pageContext2.jsp | 9 +-
webapps/docs/changelog.xml | 297 +++++++-
webapps/docs/class-loader-howto.xml | 12 +-
webapps/docs/config/cluster-interceptor.xml | 2 +-
webapps/docs/config/systemprops.xml | 3 +
webapps/docs/windows-auth-howto.xml | 34 +-
webapps/examples/jsp/forward/one.jsp | 2 +-
webapps/examples/jsp/forward/two.html | 2 +-
webapps/examples/jsp/include/foo.jsp | 6 +-
webapps/examples/jsp/include/include.jsp | 9 +-
202 files changed, 3780 insertions(+), 7657 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