This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository tomcat6.
commit 09873379ae1da213eb251a457a82a4e4a9de46ba Merge: 44a9c80 2e8855b Author: tony mancill <[email protected]> Date: Sat Aug 3 20:44:46 2013 -0700 Merge tag 'upstream/6.0.37' Upstream version 6.0.37 BUILDING.txt | 28 +- NOTICE | 2 +- RELEASE-NOTES | 16 +- RUNNING.txt | 452 ++- STATUS.txt | 111 +- bin/catalina.sh | 20 +- bin/daemon.sh | 239 ++ bin/setclasspath.sh | 9 +- build.properties.default | 29 +- build.xml | 31 +- conf/web.xml | 4072 ++++++++++++++++++-- dist.xml | 57 +- eclipse.classpath | 2 +- extras.xml | 15 +- java/javax/el/ResourceBundleELResolver.java | 194 +- java/javax/servlet/http/HttpServlet.java | 38 +- java/javax/servlet/http/HttpServletResponse.java | 60 +- .../authenticator/DigestAuthenticator.java | 171 +- .../catalina/authenticator/FormAuthenticator.java | 21 +- .../catalina/authenticator/SavedRequest.java | 17 +- java/org/apache/catalina/connector/Connector.java | 78 +- .../apache/catalina/connector/CoyoteAdapter.java | 4 +- .../catalina/connector/LocalStrings.properties | 1 + java/org/apache/catalina/connector/Request.java | 8 +- .../catalina/connector/mbeans-descriptors.xml | 4 + .../catalina/core/ApplicationFilterConfig.java | 8 +- .../apache/catalina/core/AprLifecycleListener.java | 139 +- .../core/JreMemoryLeakPreventionListener.java | 13 +- .../apache/catalina/core/LocalStrings.properties | 10 +- .../catalina/core/LocalStrings_es.properties | 5 +- .../catalina/core/StandardThreadExecutor.java | 72 +- java/org/apache/catalina/core/StandardWrapper.java | 39 +- .../catalina/filters/CsrfPreventionFilter.java | 24 +- .../filters/SetCharacterEncodingFilter.java | 134 + .../ha/authenticator/ClusterSingleSignOn.java | 16 +- .../authenticator/ClusterSingleSignOnListener.java | 16 +- .../ha/authenticator/SingleSignOnMessage.java | 9 + .../apache/catalina/ha/session/DeltaManager.java | 11 +- .../ha/session/SimpleTcpReplicationManager.java | 9 +- .../catalina/ha/session/mbeans-descriptors.xml | 6 +- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +- .../apache/catalina/loader/WebappClassLoader.java | 171 +- java/org/apache/catalina/manager/Constants.java | 2 +- .../catalina/manager/HTMLManagerServlet.java | 6 +- .../apache/catalina/manager/host/Constants.java | 2 +- .../org/apache/catalina/realm/DataSourceRealm.java | 17 +- java/org/apache/catalina/realm/JDBCRealm.java | 17 +- .../apache/catalina/realm/LocalStrings.properties | 7 +- java/org/apache/catalina/realm/RealmBase.java | 99 +- .../catalina/realm/X509SubjectDnRetriever.java | 30 + .../catalina/realm/X509UsernameRetriever.java | 33 + .../org/apache/catalina/security/SecurityUtil.java | 71 +- java/org/apache/catalina/servlets/CGIServlet.java | 8 +- java/org/apache/catalina/session/ManagerBase.java | 119 +- .../apache/catalina/session/StandardManager.java | 7 +- .../session/TooManyActiveSessionsException.java | 57 + java/org/apache/catalina/ssi/SSIProcessor.java | 10 +- .../org/apache/catalina/startup/ContextConfig.java | 8 +- java/org/apache/catalina/startup/ExpandWar.java | 9 +- .../catalina/startup/LocalStrings.properties | 1 + java/org/apache/catalina/startup/TldConfig.java | 4 + .../group/interceptors/TcpFailureDetector.java | 14 +- .../group/interceptors/TcpPingInterceptor.java | 28 +- .../tribes/membership/McastServiceImpl.java | 4 +- .../apache/catalina/util/ExtensionValidator.java | 4 +- java/org/apache/catalina/util/HexUtils.java | 56 - .../apache/catalina/valves/ErrorReportValve.java | 25 +- .../apache/catalina/valves/LocalStrings.properties | 104 +- .../catalina/valves/LocalStrings_es.properties | 82 +- .../catalina/valves/LocalStrings_fr.properties | 82 +- java/org/apache/catalina/valves/RemoteIpValve.java | 10 +- .../apache/catalina/valves/RequestFilterValve.java | 40 +- .../catalina/valves/StuckThreadDetectionValve.java | 297 ++ .../apache/catalina/valves/mbeans-descriptors.xml | 35 + java/org/apache/coyote/AbstractProtocol.java | 31 + java/org/apache/coyote/ajp/AjpAprProcessor.java | 12 +- java/org/apache/coyote/ajp/AjpAprProtocol.java | 10 +- java/org/apache/coyote/ajp/AjpProcessor.java | 9 +- java/org/apache/coyote/ajp/AjpProtocol.java | 10 +- .../apache/coyote/http11/Http11AprProcessor.java | 6 +- .../apache/coyote/http11/Http11AprProtocol.java | 27 +- .../apache/coyote/http11/Http11NioProcessor.java | 6 +- .../apache/coyote/http11/Http11NioProtocol.java | 10 +- java/org/apache/coyote/http11/Http11Processor.java | 6 +- java/org/apache/coyote/http11/Http11Protocol.java | 10 +- .../coyote/http11/InternalAprInputBuffer.java | 5 + .../coyote/http11/InternalAprOutputBuffer.java | 5 + .../apache/coyote/http11/InternalInputBuffer.java | 5 + .../coyote/http11/InternalNioInputBuffer.java | 12 +- .../apache/coyote/http11/InternalOutputBuffer.java | 5 + .../coyote/http11/filters/ChunkedInputFilter.java | 89 +- .../http11/filters/FlushableGZIPOutputStream.java | 18 +- java/org/apache/el/lang/ELSupport.java | 32 +- java/org/apache/jasper/JspC.java | 39 +- java/org/apache/jasper/compiler/Generator.java | 2 + java/org/apache/jasper/compiler/JDTCompiler.java | 4 + java/org/apache/jasper/compiler/Parser.java | 8 +- .../apache/jasper/compiler/TldLocationsCache.java | 4 + java/org/apache/jk/common/HandlerRequest.java | 27 +- java/org/apache/jk/server/JkCoyoteHandler.java | 2 +- java/org/apache/jk/server/JkMain.java | 13 + java/org/apache/juli/DateFormatCache.java | 14 +- java/org/apache/naming/SelectorContext.java | 276 +- .../apache/naming/java/javaURLContextFactory.java | 10 +- .../apache/naming/resources/FileDirContext.java | 4 +- java/org/apache/tomcat/jni/Library.java | 7 +- java/org/apache/tomcat/jni/SSL.java | 27 +- java/org/apache/tomcat/util/buf/B2CConverter.java | 19 +- java/org/apache/tomcat/util/buf/HexUtils.java | 41 +- java/org/apache/tomcat/util/buf/UDecoder.java | 92 +- .../tomcat/util/http/LocalStrings.properties | 5 + java/org/apache/tomcat/util/http/MimeHeaders.java | 34 +- java/org/apache/tomcat/util/http/Parameters.java | 123 +- .../org/apache/tomcat/util/http/mapper/Mapper.java | 2 +- .../tomcat/util/http/res/LocalStrings.properties | 18 +- .../util/http/res/LocalStrings_ja.properties | 50 +- .../org/apache/tomcat/util/log/UserDataHelper.java | 149 + .../apache/tomcat/util/net/AbstractEndpoint.java | 33 + java/org/apache/tomcat/util/net/AprEndpoint.java | 121 +- java/org/apache/tomcat/util/net/JIoEndpoint.java | 2 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 36 +- .../apache/tomcat/util/net/SocketProperties.java | 6 +- .../tomcat/util/net/res/LocalStrings.properties | 7 + res/License.rtf | 409 -- res/maven/README.txt | 41 + res/maven/annotations-api.pom | 8 + res/maven/{coyote.pom => catalina-ant.pom} | 22 +- res/maven/catalina-ha.pom | 8 + res/maven/catalina.pom | 8 + res/maven/coyote.pom | 8 + res/maven/dbcp.pom | 8 + res/maven/el-api.pom | 8 + res/maven/jasper-el.pom | 8 + res/maven/jasper.pom | 10 +- res/maven/jsp-api.pom | 8 + res/maven/juli-adapters.pom | 8 + res/maven/juli-extras.pom | 8 + res/maven/juli.pom | 8 + res/maven/mvn-pub.xml | 272 +- res/maven/mvn.properties.default | 43 +- res/maven/servlet-api.pom | 8 + .../{coyote.pom => tomcat-catalina-jmx-remote.pom} | 18 +- res/maven/{jsp-api.pom => tomcat-catalina-ws.pom} | 20 +- res/maven/{el-api.pom => tomcat-i18n-es.pom} | 12 +- res/maven/{el-api.pom => tomcat-i18n-fr.pom} | 12 +- res/maven/{el-api.pom => tomcat-i18n-ja.pom} | 12 +- res/maven/tribes.pom | 8 + res/tomcat.nsi | 6 +- test/org/apache/el/lang/TestELSupport.java | 4 + webapps/ROOT/index.html | 3 +- webapps/ROOT/index.jsp | 3 +- webapps/docs/appdev/deployment.xml | 10 +- webapps/docs/appdev/introduction.xml | 20 +- webapps/docs/apr.xml | 19 +- webapps/docs/architecture/overview.xml | 2 +- webapps/docs/building.xml | 5 +- webapps/docs/changelog.xml | 608 ++- webapps/docs/class-loader-howto.xml | 4 +- webapps/docs/config/ajp.xml | 29 +- webapps/docs/config/cluster-interceptor.xml | 15 + webapps/docs/config/cluster-receiver.xml | 2 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/context.xml | 148 +- webapps/docs/config/executor.xml | 7 +- webapps/docs/config/filter.xml | 59 +- webapps/docs/config/http.xml | 58 +- webapps/docs/config/listeners.xml | 12 +- webapps/docs/config/manager.xml | 16 +- webapps/docs/config/project.xml | 4 +- webapps/docs/config/realm.xml | 130 +- webapps/docs/config/systemprops.xml | 39 + webapps/docs/config/valve.xml | 139 +- webapps/docs/deployer-howto.xml | 35 +- webapps/docs/funcspecs/fs-admin-objects.xml | 4 +- webapps/docs/funcspecs/fs-jndi-realm.xml | 6 +- webapps/docs/index.xml | 4 +- webapps/docs/jasper-howto.xml | 2 +- webapps/docs/jndi-datasource-examples-howto.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 19 +- webapps/docs/logging.xml | 2 +- webapps/docs/manager-howto.xml | 154 +- webapps/docs/monitoring.xml | 518 +-- webapps/docs/realm-howto.xml | 19 +- webapps/docs/security-manager-howto.xml | 2 +- webapps/docs/setup.xml | 29 +- webapps/docs/ssi-howto.xml | 4 +- webapps/docs/tomcat-docs.xsl | 24 +- webapps/docs/tribes/tomcat-docs.xsl | 4 +- webapps/docs/windows-service-howto.xml | 10 +- .../examples/WEB-INF/classes/CookieExample.java | 5 +- .../WEB-INF/classes/RequestHeaderExample.java | 5 +- .../WEB-INF/classes/RequestInfoExample.java | 46 +- .../WEB-INF/classes/RequestParamExample.java | 3 +- .../examples/WEB-INF/classes/SessionExample.java | 12 +- webapps/examples/jsp/cal/login.html | 2 +- webapps/examples/jsp/jsp2/jspx/svgexample.html | 2 +- webapps/examples/jsp/jsp2/jspx/textRotate.jspx | 2 +- webapps/host-manager/META-INF/context.xml | 11 +- webapps/host-manager/{ => WEB-INF/jsp}/401.jsp | 5 +- webapps/host-manager/{ => WEB-INF/jsp}/403.jsp | 5 +- webapps/host-manager/WEB-INF/web.xml | 9 + webapps/manager/META-INF/context.xml | 11 +- webapps/manager/{ => WEB-INF/jsp}/401.jsp | 3 - webapps/manager/{ => WEB-INF/jsp}/403.jsp | 3 - webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 2 +- webapps/manager/WEB-INF/jsp/sessionsList.jsp | 2 +- webapps/manager/WEB-INF/web.xml | 4 +- 207 files changed, 9534 insertions(+), 2899 deletions(-) -- Alioth's hooks/post-receive 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
