This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository tomcat6.
commit c57c7d7f0483118e67879254871a4fdc814edb7b Merge: ce84075 289f3a9 Author: Markus Koschany <[email protected]> Date: Sat Feb 27 16:11:04 2016 +0100 Merge tag 'upstream/6.0.45' Upstream version 6.0.45 # gpg: Signature made Sat 27 Feb 2016 16:11:00 CET using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] .gitignore | 1 + BUILDING.txt | 135 ++- LICENSE | 2 +- NOTICE | 12 +- RELEASE-NOTES | 2 +- RUNNING.txt | 8 +- STATUS.txt | 19 +- bin/catalina-tasks.xml | 7 +- bin/catalina.bat | 4 +- bin/catalina.sh | 4 +- bin/setclasspath.bat | 13 +- bin/setclasspath.sh | 12 +- build.properties.default | 44 +- build.xml | 213 +++- conf/web.xml | 22 +- dist.xml | 57 +- extras.xml | 25 +- java/javax/el/BeanELResolver.java | 60 +- java/javax/servlet/http/LocalStrings.properties | 2 +- java/javax/servlet/resources/web-app_2_5.xsd | 2 +- java/org/apache/catalina/Context.java | 41 +- java/org/apache/catalina/Globals.java | 43 +- java/org/apache/catalina/Manager.java | 38 +- java/org/apache/catalina/ServerFactory.java | 40 +- java/org/apache/catalina/Session.java | 19 + .../authenticator/DigestAuthenticator.java | 2 +- .../catalina/authenticator/FormAuthenticator.java | 14 + java/org/apache/catalina/connector/Connector.java | 41 +- .../org/apache/catalina/connector/InputBuffer.java | 5 +- .../catalina/connector/LocalStrings.properties | 1 + .../apache/catalina/connector/MapperListener.java | 15 +- .../apache/catalina/connector/OutputBuffer.java | 7 +- java/org/apache/catalina/connector/Request.java | 157 +-- .../catalina/connector/mbeans-descriptors.xml | 7 +- .../catalina/core/ApplicationHttpRequest.java | 152 ++- .../apache/catalina/core/AprLifecycleListener.java | 87 +- java/org/apache/catalina/core/ContainerBase.java | 152 +-- .../apache/catalina/core/LocalStrings.properties | 2 + .../catalina/core/RestrictedServlets.properties | 1 + java/org/apache/catalina/core/StandardContext.java | 58 +- java/org/apache/catalina/core/StandardServer.java | 49 +- java/org/apache/catalina/core/StandardWrapper.java | 2 +- .../apache/catalina/core/mbeans-descriptors.xml | 8 + .../catalina/filters/FailedRequestFilter.java | 38 +- .../apache/catalina/ha/session/BackupManager.java | 8 - .../catalina/ha/session/ClusterManagerBase.java | 50 +- .../apache/catalina/ha/session/DeltaManager.java | 38 +- .../apache/catalina/ha/session/DeltaSession.java | 47 +- .../catalina/ha/session/mbeans-descriptors.xml | 24 + .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 17 +- java/org/apache/catalina/manager/Constants.java | 2 +- .../catalina/manager/HTMLManagerServlet.java | 7 +- .../apache/catalina/manager/ManagerServlet.java | 2 +- .../apache/catalina/manager/StatusTransformer.java | 50 +- .../apache/catalina/manager/host/Constants.java | 2 +- java/org/apache/catalina/mbeans/MBeanUtils.java | 30 +- java/org/apache/catalina/realm/CombinedRealm.java | 20 +- java/org/apache/catalina/realm/JNDIRealm.java | 2 +- java/org/apache/catalina/realm/package.html | 52 +- java/org/apache/catalina/servlets/CGIServlet.java | 124 +- .../apache/catalina/servlets/DefaultServlet.java | 71 +- .../apache/catalina/servlets/WebdavServlet.java | 31 +- java/org/apache/catalina/session/Constants.java | 18 +- java/org/apache/catalina/session/FileStore.java | 207 ++-- java/org/apache/catalina/session/JDBCStore.java | 113 +- .../catalina/session/LocalStrings.properties | 4 + java/org/apache/catalina/session/ManagerBase.java | 392 +++++-- .../apache/catalina/session/StandardManager.java | 234 ++-- .../apache/catalina/session/StandardSession.java | 103 +- .../catalina/session/StandardSessionFacade.java | 11 +- java/org/apache/catalina/session/StoreBase.java | 37 +- .../apache/catalina/session/mbeans-descriptors.xml | 24 + java/org/apache/catalina/startup/HostConfig.java | 271 ++--- .../apache/catalina/startup/catalina.properties | 81 -- .../catalina/util/CustomObjectInputStream.java | 106 +- .../apache/catalina/util/LocalStrings.properties | 2 + java/org/apache/catalina/util/ParameterMap.java | 26 +- java/org/apache/catalina/util/RequestUtil.java | 63 +- .../catalina/valves/ExtendedAccessLogValve.java | 22 +- .../apache/catalina/valves/PersistentValve.java | 161 ++- .../apache/catalina/valves/RemoteAddrValve.java | 41 +- .../apache/catalina/valves/RemoteHostValve.java | 41 +- .../apache/catalina/valves/mbeans-descriptors.xml | 22 +- java/org/apache/coyote/AbstractProtocol.java | 61 + java/org/apache/coyote/Constants.java | 31 + java/org/apache/coyote/Request.java | 6 +- java/org/apache/coyote/ajp/AjpAprProcessor.java | 21 +- java/org/apache/coyote/ajp/AjpAprProtocol.java | 9 +- java/org/apache/coyote/ajp/AjpProcessor.java | 21 +- java/org/apache/coyote/ajp/AjpProtocol.java | 9 +- java/org/apache/coyote/ajp/Constants.java | 1 + .../apache/coyote/http11/AbstractInputBuffer.java | 72 ++ .../apache/coyote/http11/Http11AprProtocol.java | 9 +- .../apache/coyote/http11/Http11NioProtocol.java | 89 +- java/org/apache/coyote/http11/Http11Protocol.java | 76 +- .../coyote/http11/InternalAprInputBuffer.java | 71 +- .../apache/coyote/http11/InternalInputBuffer.java | 69 +- .../coyote/http11/InternalNioInputBuffer.java | 224 ++-- .../coyote/http11/filters/ChunkedInputFilter.java | 161 +-- .../coyote/http11/filters/IdentityInputFilter.java | 28 +- .../coyote/http11/filters}/LocalStrings.properties | 23 +- .../coyote/memory/MemoryProtocolHandler.java | 17 +- java/org/apache/jasper/JspC.java | 4 + java/org/apache/jasper/compiler/Compiler.java | 4 +- java/org/apache/jasper/compiler/ELParser.java | 23 +- java/org/apache/jasper/compiler/JDTCompiler.java | 15 +- java/org/apache/jasper/compiler/JspReader.java | 2 +- java/org/apache/jasper/compiler/JspUtil.java | 2 +- java/org/apache/jasper/compiler/PageDataImpl.java | 2 +- java/org/apache/jasper/compiler/Parser.java | 7 +- .../apache/jasper/compiler/ParserController.java | 2 +- .../apache/jasper/compiler/TagFileProcessor.java | 2 +- .../apache/jasper/compiler/TagLibraryInfoImpl.java | 2 +- java/org/apache/jasper/compiler/Validator.java | 8 +- .../jasper/resources/LocalStrings.properties | 2 +- .../org/apache/jasper/runtime/PageContextImpl.java | 55 +- .../jasper/runtime/ProtectedFunctionMapper.java | 105 +- .../apache/jasper/security/SecurityClassLoad.java | 10 - .../apache/jasper/servlet/JspServletWrapper.java | 2 +- java/org/apache/jk/common/AjpConstants.java | 1 + java/org/apache/jk/common/ChannelNioSocket.java | 51 +- java/org/apache/jk/common/ChannelSocket.java | 51 +- java/org/apache/jk/common/HandlerRequest.java | 14 +- java/org/apache/jk/core/MsgContext.java | 7 +- java/org/apache/jk/server/JkCoyoteHandler.java | 33 + .../apache/naming/factory/ResourceLinkFactory.java | 7 +- .../apache/naming/resources/EmptyDirContext.java | 341 ++++++ .../apache/naming/resources/FileDirContext.java | 35 +- java/org/apache/tomcat/jni/Address.java | 4 +- java/org/apache/tomcat/jni/BIOCallback.java | 5 +- java/org/apache/tomcat/jni/Buffer.java | 89 ++ java/org/apache/tomcat/jni/Directory.java | 5 +- java/org/apache/tomcat/jni/Error.java | 8 +- java/org/apache/tomcat/jni/File.java | 35 +- java/org/apache/tomcat/jni/FileInfo.java | 2 - java/org/apache/tomcat/jni/Global.java | 3 +- java/org/apache/tomcat/jni/Library.java | 66 +- .../apache/tomcat/jni/LibraryNotFoundError.java | 36 +- java/org/apache/tomcat/jni/Local.java | 3 +- java/org/apache/tomcat/jni/Lock.java | 5 +- java/org/apache/tomcat/jni/Mmap.java | 2 - java/org/apache/tomcat/jni/Multicast.java | 3 +- java/org/apache/tomcat/jni/OS.java | 8 +- java/org/apache/tomcat/jni/PasswordCallback.java | 2 - java/org/apache/tomcat/jni/Poll.java | 63 +- java/org/apache/tomcat/jni/Pool.java | 7 +- java/org/apache/tomcat/jni/PoolCallback.java | 2 - java/org/apache/tomcat/jni/Proc.java | 7 +- java/org/apache/tomcat/jni/ProcErrorCallback.java | 2 - java/org/apache/tomcat/jni/Procattr.java | 11 +- java/org/apache/tomcat/jni/Registry.java | 2 - java/org/apache/tomcat/jni/SSL.java | 63 +- java/org/apache/tomcat/jni/SSLContext.java | 67 +- java/org/apache/tomcat/jni/SSLSocket.java | 7 +- java/org/apache/tomcat/jni/Shm.java | 17 +- java/org/apache/tomcat/jni/Sockaddr.java | 2 - java/org/apache/tomcat/jni/Socket.java | 76 +- java/org/apache/tomcat/jni/Status.java | 3 +- java/org/apache/tomcat/jni/Stdlib.java | 5 +- .../tomcat/jni/{PoolCallback.java => Thread.java} | 12 +- java/org/apache/tomcat/jni/Time.java | 5 +- java/org/apache/tomcat/jni/User.java | 5 +- java/org/apache/tomcat/util/buf/MessageBytes.java | 114 +- java/org/apache/tomcat/util/http/Cookies.java | 31 +- java/org/apache/tomcat/util/http/Parameters.java | 71 +- .../org/apache/tomcat/util/http/mapper/Mapper.java | 290 ++--- .../apache/tomcat/util/net/AbstractEndpoint.java | 4 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 99 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 25 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 358 +++--- .../apache/tomcat/util/net/SSLImplementation.java | 3 +- .../apache/tomcat/util/net/jsse/JSSEFactory.java | 19 +- .../tomcat/util/net/jsse/JSSEImplementation.java | 14 +- .../tomcat/util/net/jsse/JSSESocketFactory.java | 379 +++--- .../util/net/jsse/res/LocalStrings.properties | 7 + res/INSTALLLICENSE | 2 +- res/maven/mvn.properties.default | 2 +- res/tomcat.nsi | 11 +- test/build.xml | 71 -- .../deployment/dirContext/META-INF/context.xml | 23 +- .../deployment/dirContext/index.html | 28 +- .../deployment/dirNoContext/index.html | 28 +- test/javax/el/TestArrayELResolver.java | 182 ++- test/org/apache/catalina/TestServerFactory.java | 53 + .../apache/catalina/connector/TestConnector.java | 31 +- .../catalina/core/TestApplicationHttpRequest.java | 358 ++++++ .../ha/session/TestSerializablePrincipal.java | 111 +- .../{TestPrincipal.java => TesterPrincipal.java} | 12 +- .../catalina/startup/CaseInsensitiveKeyMap.java | 197 ++++ .../catalina/startup/FastNonSecureRandom.java | 60 + .../apache/catalina/startup/LoggingBaseTest.java | 125 ++ test/org/apache/catalina/startup/TestTomcat.java | 594 ++++++++++ test/org/apache/catalina/startup/Tomcat.java | 1207 ++++++++++++++++++++ .../apache/catalina/startup/TomcatBaseTest.java | 796 +++++++++++++ test/org/apache/catalina/tribes/TesterUtil.java | 52 + .../group/TestGroupChannelMemberArrival.java | 181 +++ .../TestGroupChannelOptionFlag.java} | 56 +- .../TestGroupChannelSenderConnections.java} | 132 ++- .../TestGroupChannelStartStop.java} | 82 +- .../interceptors/TestDomainFilterInterceptor.java} | 31 +- .../interceptors/TestNonBlockingCoordinator.java | 106 +- .../interceptors/TestOrderInterceptor.java | 90 +- .../interceptors}/TestTcpFailureDetector.java | 88 +- .../apache/catalina/tribes/io/TestXByteBuffer.java | 57 + .../TestMemberImplSerialization.java} | 31 +- .../{TestNioSender.java => NioSenderTest.java} | 10 +- .../catalina/tribes/test/TribesTestSuite.java | 40 +- .../tribes/test/channel/TestDataIntegrity.java | 38 +- .../test/channel/TestRemoteProcessException.java | 65 +- .../tribes/test/membership/TestMemberArrival.java | 117 -- .../valves/TestExtendedAccessLogValve.java | 63 + .../apache/catalina/valves/TestRemoteIpValve.java | 357 +++--- test/org/apache/el/TestELEvaluation.java | 44 +- test/org/apache/el/lang/TestELArithmetic.java | 56 +- test/org/apache/el/lang/TestELSupport.java | 30 +- .../jasper/compiler/TestAttributeParser.java | 39 +- test/org/apache/jasper/compiler/TestELParser.java | 6 + .../org/apache/juli/TestClassLoaderLogManager.java | 49 +- test/org/apache/juli/TestDateFormatCache.java | 109 ++ .../apache/tomcat/util/buf/TestB2CConverter.java | 61 + test/org/apache/tomcat/util/http/TestCookies.java | 37 +- .../apache/tomcat/util/res/TestStringManager.java | 14 +- webapps/docs/apr.xml | 15 +- webapps/docs/architecture/overview.xml | 2 +- .../docs/architecture/startup/serverStartup.txt | 235 ++-- webapps/docs/building.xml | 8 +- webapps/docs/cgi-howto.xml | 47 +- webapps/docs/changelog.xml | 622 +++++++++- webapps/docs/cluster-howto.xml | 2 +- webapps/docs/config/ajp.xml | 10 +- webapps/docs/config/cluster-manager.xml | 69 +- webapps/docs/config/cluster-membership.xml | 3 +- webapps/docs/config/cluster.xml | 6 +- webapps/docs/config/context.xml | 18 +- webapps/docs/config/host.xml | 2 +- webapps/docs/config/http.xml | 37 +- webapps/docs/config/listeners.xml | 4 +- webapps/docs/config/manager.xml | 80 ++ webapps/docs/config/realm.xml | 6 +- webapps/docs/config/systemprops.xml | 27 + webapps/docs/config/valve.xml | 136 ++- webapps/docs/deployer-howto.xml | 10 +- webapps/docs/funcspecs/fs-default.xml | 2 +- webapps/docs/funcspecs/fs-invoker.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/html-manager-howto.xml | 10 +- webapps/docs/jasper-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 4 +- webapps/docs/logging.xml | 2 +- webapps/docs/manager-howto.xml | 422 ++++--- webapps/docs/ssl-howto.xml | 169 ++- webapps/docs/tomcat-docs.xsl | 10 +- webapps/docs/tribes/introduction.xml | 2 +- webapps/docs/tribes/tomcat-docs.xsl | 4 +- webapps/docs/windows-service-howto.xml | 212 ++-- .../compressionFilters/CompressionFilter.java | 3 +- .../WEB-INF/lib/taglibs-standard-impl-1.2.5.jar | Bin 0 -> 206430 bytes .../WEB-INF/lib/taglibs-standard-spec-1.2.5.jar | Bin 0 -> 40153 bytes webapps/host-manager/WEB-INF/jsp/401.jsp | 1 + webapps/host-manager/WEB-INF/jsp/403.jsp | 1 + STATUS.txt => webapps/host-manager/index.jsp | 24 +- webapps/manager/WEB-INF/jsp/401.jsp | 1 + webapps/manager/WEB-INF/jsp/403.jsp | 1 + webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +- STATUS.txt => webapps/manager/index.jsp | 24 +- webapps/manager/status.xsd | 125 +- webapps/manager/xform.xsl | 75 +- 270 files changed, 11679 insertions(+), 4708 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
