[tomcat7] branch master updated (9d34fad -> e102c8f)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 6 15:48:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository tomcat7.
from 9d34fad Exclude the taglibs-standard-*.jar files from the upstream tarball
adds 4144423 Imported Upstream version 7.0.61
new be5b765 Merge tag 'upstream/7.0.61'
new ab13aa5 Refreshed the patches
new e0df8e2 debian/rules: export JAVA_HOME to fix a build failure
new 59d9208 Removed the timestamp from the Javadoc of the Servlet API to make the build reproducible
new 09c7490 Mark bug #765922 as fixed by tomcat7/7.0.57-1
new 53ad89d Updated the test certificates
new 94da337 Added a patch renaming the taglibs-standard-*.jar files used in the tests
new e102c8f Upload to unstable
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
BUILDING.txt | 2 +-
STATUS.txt | 4 +-
bin/catalina-tasks.xml | 10 +-
build.properties.default | 8 +-
build.xml | 71 +++-
conf/catalina.properties | 2 +-
debian/changelog | 14 +-
debian/keystores/ca.jks | Bin 3841 -> 952 bytes
debian/keystores/localhost-cert.pem | 108 ++----
debian/keystores/localhost-copy1.jks | Bin 2467 -> 2197 bytes
debian/keystores/localhost.jks | Bin 2467 -> 2197 bytes
debian/keystores/user1.jks | Bin 3877 -> 2194 bytes
...1-set-UTF-8-as-default-character-encoding.patch | 2 +-
...02-do-not-load-AJP13-connector-by-default.patch | 2 +-
.../patches/0003-disable-APR-library-loading.patch | 2 +-
...-deploy-webapps-target-from-deploy-target.patch | 4 +-
debian/patches/0010-debianize-build-xml.patch | 6 +-
.../0011-fix-classpath-lintian-warnings.patch | 10 +-
...nt-look-for-build-properties-in-user-home.patch | 2 +-
debian/patches/0017-use-jdbc-pool-default.patch | 4 +-
.../0019-add-distribution-to-error-page.patch | 2 +-
.../0025-standard-taglibs-compatibility.patch | 33 ++
debian/patches/series | 1 +
debian/rules | 4 +-
java/javax/el/ValueExpression.java | 2 +-
java/javax/servlet/http/HttpServlet.java | 12 +-
java/javax/servlet/resources/web-app_2_5.xsd | 2 +-
java/org/apache/catalina/Realm.java | 9 +
.../catalina/authenticator/AuthenticatorBase.java | 78 ++++
.../catalina/authenticator/BasicAuthenticator.java | 29 +-
.../authenticator/DigestAuthenticator.java | 42 +-
.../catalina/authenticator/FormAuthenticator.java | 35 +-
.../catalina/authenticator/LocalStrings.properties | 4 +
.../authenticator/NonLoginAuthenticator.java | 35 +-
.../catalina/authenticator/SSLAuthenticator.java | 37 +-
.../catalina/authenticator/SingleSignOn.java | 23 +-
.../authenticator/SpnegoAuthenticator.java | 30 +-
.../apache/catalina/connector/CoyoteAdapter.java | 58 ++-
.../catalina/connector/LocalStrings.properties | 3 +-
java/org/apache/catalina/connector/Request.java | 47 +--
.../apache/catalina/core/ApplicationContext.java | 30 +-
.../catalina/core/ApplicationHttpRequest.java | 29 +-
.../apache/catalina/core/AprLifecycleListener.java | 34 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 10 +-
.../core/JreMemoryLeakPreventionListener.java | 2 +-
.../apache/catalina/core/LocalStrings.properties | 3 +
java/org/apache/catalina/core/StandardContext.java | 12 +-
java/org/apache/catalina/core/StandardHost.java | 3 +
java/org/apache/catalina/core/StandardWrapper.java | 2 +-
java/org/apache/catalina/deploy/WebXml.java | 2 +-
java/org/apache/catalina/filters/CorsFilter.java | 90 ++++-
.../apache/catalina/ha/session/DeltaManager.java | 19 -
.../catalina/ha/session/LocalStrings.properties | 1 -
.../catalina/ha/session/LocalStrings_es.properties | 1 -
.../apache/catalina/loader/WebappClassLoader.java | 2 +-
.../mbeans/JmxRemoteLifecycleListener.java | 227 +++++++----
.../apache/catalina/mbeans/LocalStrings.properties | 1 -
java/org/apache/catalina/realm/CombinedRealm.java | 35 ++
java/org/apache/catalina/realm/JNDIRealm.java | 360 ++++++++++++++++-
.../apache/catalina/realm/LocalStrings.properties | 7 +
java/org/apache/catalina/realm/RealmBase.java | 21 +
.../apache/catalina/security/SecurityListener.java | 7 +-
java/org/apache/catalina/servlets/CGIServlet.java | 20 +-
.../apache/catalina/servlets/DefaultServlet.java | 34 +-
.../org/apache/catalina/startup/ContextConfig.java | 6 +-
java/org/apache/catalina/startup/HostConfig.java | 83 ++--
java/org/apache/catalina/startup/Tomcat.java | 38 +-
.../catalina/startup/WebappServiceLoader.java | 19 +-
.../interceptors/DomainFilterInterceptor.java | 8 +-
.../catalina/valves/ExtendedAccessLogValve.java | 23 +-
.../apache/catalina/valves/PersistentValve.java | 4 +-
java/org/apache/catalina/websocket/WsOutbound.java | 2 +-
java/org/apache/coyote/AbstractProtocol.java | 13 +-
java/org/apache/coyote/ActionCode.java | 8 +-
java/org/apache/coyote/Request.java | 20 +-
.../apache/coyote/ajp/AbstractAjpProcessor.java | 26 +-
.../org/apache/coyote/ajp/AbstractAjpProtocol.java | 15 +-
java/org/apache/coyote/ajp/AjpAprProtocol.java | 1 +
java/org/apache/coyote/ajp/AjpNioProcessor.java | 44 ++-
java/org/apache/coyote/ajp/AjpNioProtocol.java | 1 +
java/org/apache/coyote/ajp/AjpProtocol.java | 1 +
java/org/apache/coyote/ajp/Constants.java | 1 +
.../coyote/http11/AbstractHttp11Processor.java | 15 +-
.../coyote/http11/AbstractHttp11Protocol.java | 63 +++
.../apache/coyote/http11/AbstractInputBuffer.java | 17 +-
.../apache/coyote/http11/AbstractOutputBuffer.java | 4 +-
.../apache/coyote/http11/Http11AprProcessor.java | 12 +-
.../apache/coyote/http11/Http11AprProtocol.java | 4 +-
.../apache/coyote/http11/Http11NioProcessor.java | 12 +-
.../apache/coyote/http11/Http11NioProtocol.java | 4 +-
java/org/apache/coyote/http11/Http11Processor.java | 12 +-
java/org/apache/coyote/http11/Http11Protocol.java | 4 +-
.../coyote/http11/filters/BufferedInputFilter.java | 2 +
.../coyote/http11/filters/ChunkedInputFilter.java | 29 +-
.../coyote/http11/filters/IdentityInputFilter.java | 18 +-
.../coyote/http11/upgrade/AbstractProcessor.java | 18 +-
.../coyote/http11/upgrade/LocalStrings.properties | 2 +
java/org/apache/el/lang/ELSupport.java | 22 +-
.../org/apache/el/parser/AstLiteralExpression.java | 5 +-
java/org/apache/jasper/compiler/Compiler.java | 4 +-
java/org/apache/jasper/compiler/ELParser.java | 69 ++--
.../apache/jasper/compiler/JspDocumentParser.java | 6 +-
java/org/apache/jasper/compiler/JspReader.java | 2 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 2 +-
java/org/apache/jasper/compiler/Parser.java | 78 ++--
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 2 +-
.../jasper/runtime/ProtectedFunctionMapper.java | 92 +----
.../apache/jasper/security/SecurityClassLoad.java | 8 -
.../apache/jasper/servlet/JspCServletContext.java | 11 +-
.../apache/jasper/servlet/JspServletWrapper.java | 2 +-
java/org/apache/naming/factory/BeanFactory.java | 79 +++-
java/org/apache/tomcat/jni/Library.java | 44 +--
.../apache/tomcat/jni/LibraryNotFoundError.java} | 40 +-
java/org/apache/tomcat/util/compat/Jre7Compat.java | 58 +++
java/org/apache/tomcat/util/compat/Jre8Compat.java | 95 +++++
java/org/apache/tomcat/util/compat/JreCompat.java | 124 ++++++
.../util/compat}/LocalStrings.properties | 2 +-
.../http/fileupload/util/mime/MimeUtility.java | 2 +-
.../modules/MbeansDescriptorsDigesterSource.java | 15 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 37 ++
java/org/apache/tomcat/util/net/AprEndpoint.java | 28 +-
java/org/apache/tomcat/util/net/JIoEndpoint.java | 2 +
java/org/apache/tomcat/util/net/NioEndpoint.java | 2 +
java/org/apache/tomcat/util/net/SSLSupport.java | 12 +
.../tomcat/util/net/jsse/JSSESocketFactory.java | 65 +++-
.../apache/tomcat/util/net/jsse/JSSESupport.java | 8 +
.../util/net/jsse/res/LocalStrings.properties | 3 +-
.../tomcat/util/net/res/LocalStrings.properties | 1 +
.../tomcat/websocket/AsyncChannelGroupUtil.java | 4 +-
.../apache/tomcat/websocket/PerMessageDeflate.java | 54 +--
.../tomcat/websocket/WsWebSocketContainer.java | 8 +-
modules/jdbc-pool/doc/jdbc-pool.xml | 2 +-
modules/jdbc-pool/doc/package.xsl | 2 +-
.../tomcat/jdbc/test/TestSizePreservation.java | 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/maven/mvn.properties.default | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
test/javax/el/TestArrayELResolver.java | 2 +-
test/javax/servlet/http/TestHttpServlet.java | 74 ++++
.../TestSSOnonLoginAndBasicAuthenticator.java | 2 +-
.../TestSSOnonLoginAndDigestAuthenticator.java | 2 +-
.../TesterDigestAuthenticatorPerformance.java | 5 +
.../org/apache/catalina/connector/TestRequest.java | 6 +-
.../catalina/core/TestApplicationContext.java | 11 +-
.../apache/catalina/core/TestAsyncContextImpl.java | 2 +-
.../catalina/core/TestStandardContextAliases.java | 8 +-
.../apache/catalina/filters/TestCorsFilter.java | 131 ++++++-
.../catalina/filters/TesterHttpServletRequest.java | 20 +-
...TestWebappClassLoaderThreadLocalMemoryLeak.java | 10 +-
.../catalina/servlets/TestDefaultServlet.java | 42 +-
.../catalina/servlets/TestWebdavServlet.java | 2 +-
.../catalina/session/TestPersistentManager.java | 89 ++++-
.../catalina/startup}/CaseInsensitiveKeyMap.java | 9 +-
.../apache/catalina/startup/SimpleHttpClient.java | 4 +
test/org/apache/catalina/startup/TestTomcat.java | 2 +-
.../catalina/startup/TestWebappServiceLoader.java | 2 +-
.../apache/catalina/startup/TomcatBaseTest.java | 20 +-
.../valves/TestExtendedAccessLogValve.java | 63 +++
.../valves/TestStuckThreadDetectionValve.java | 17 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 20 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 128 +++++-
.../coyote/http11/TestAbstractHttp11Processor.java | 105 ++++-
.../coyote/http11/TestInternalInputBuffer.java | 4 +-
.../http11/filters/TestChunkedInputFilter.java | 3 +
test/org/apache/el/TestELEvaluation.java | 14 +-
test/org/apache/el/TestELInJsp.java | 88 +++--
test/org/apache/el/lang/TestELSupport.java | 115 ++++++
.../org/apache/el/lang/TesterBean.java | 6 +-
.../el/{TesterEnum.java => lang/TesterType.java} | 16 +-
test/org/apache/el/lang/TesterTypeEditorBase.java | 79 ++++
.../TesterTypeEditorError.java} | 9 +-
.../TesterTypeEditorNoError.java} | 9 +-
test/org/apache/jasper/compiler/TestELParser.java | 4 +-
test/org/apache/jasper/compiler/TestNode.java | 2 +-
test/org/apache/jasper/compiler/TestParser.java | 6 +-
.../tomcat/unittest/TesterLeakingServlet1.java | 2 +-
.../apache/tomcat/util/buf/TestB2CConverter.java | 3 +-
test/org/apache/tomcat/util/net/localhost-cert.pem | 62 +--
.../org/apache/tomcat/util/net/localhost-copy1.jks | Bin 2197 -> 2197 bytes
test/org/apache/tomcat/util/net/localhost.jks | Bin 2197 -> 2197 bytes
test/org/apache/tomcat/util/net/user1.jks | Bin 2194 -> 2194 bytes
.../tomcat/websocket/TestWebSocketFrameClient.java | 53 +++
.../tomcat/websocket/TestWsWebSocketContainer.java | 2 +-
.../apache/tomcat/websocket/TesterEchoServer.java | 18 +
test/webapp-3.0/bug45nnn/bug45451.jspf | 22 +-
test/webapp-3.0/bug45nnn/bug45451d.jspx | 22 +-
.../bug5nnnn/{bug55642b.jsp => bug57601.jsp} | 4 +-
.../bug5nnnn/bug57601.txt} | 4 +-
webapps/docs/changelog.xml | 432 +++++++++++++++++++--
webapps/docs/class-loader-howto.xml | 6 +-
webapps/docs/config/ajp.xml | 18 +-
webapps/docs/config/automatic-deployment.xml | 12 +-
webapps/docs/config/context.xml | 6 +-
webapps/docs/config/http.xml | 19 +-
webapps/docs/config/listeners.xml | 5 +-
webapps/docs/config/realm.xml | 35 ++
webapps/docs/config/valve.xml | 16 +-
webapps/docs/deployer-howto.xml | 10 +-
webapps/docs/jasper-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 97 +++++
webapps/docs/logging.xml | 2 +-
webapps/docs/security-howto.xml | 10 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 +-
webapps/docs/windows-auth-howto.xml | 6 +-
.../WEB-INF/classes/async/AsyncStockServlet.java | 6 +-
.../compressionFilters/CompressionFilter.java | 4 +-
.../WEB-INF/classes/examples/ShowSource.java | 21 +-
webapps/examples/jsp/jsp2/el/composite.jsp | 2 +-
210 files changed, 3976 insertions(+), 1278 deletions(-)
create mode 100644 debian/patches/0025-standard-taglibs-compatibility.patch
copy java/{javax/el/ValueReference.java => org/apache/tomcat/jni/LibraryNotFoundError.java} (58%)
create mode 100644 java/org/apache/tomcat/util/compat/Jre7Compat.java
create mode 100644 java/org/apache/tomcat/util/compat/Jre8Compat.java
create mode 100644 java/org/apache/tomcat/util/compat/JreCompat.java
copy java/org/apache/{catalina/tribes/membership => tomcat/util/compat}/LocalStrings.properties (84%)
copy {java/org/apache/tomcat/websocket => test/org/apache/catalina/startup}/CaseInsensitiveKeyMap.java (94%)
create mode 100644 test/org/apache/catalina/valves/TestExtendedAccessLogValve.java
copy webapps/examples/WEB-INF/classes/websocket/snake/Direction.java => test/org/apache/el/lang/TesterBean.java (90%)
copy test/org/apache/el/{TesterEnum.java => lang/TesterType.java} (79%)
create mode 100644 test/org/apache/el/lang/TesterTypeEditorBase.java
copy test/org/apache/el/{TesterEnum.java => lang/TesterTypeEditorError.java} (79%)
copy test/org/apache/el/{TesterEnum.java => lang/TesterTypeEditorNoError.java} (80%)
copy test/webapp-3.0/bug5nnnn/{bug55642b.jsp => bug57601.jsp} (87%)
copy test/{webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties => webapp-3.0/bug5nnnn/bug57601.txt} (91%)
--
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