This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from f02e207ab8 Add change log entry
new db8ddf7ccd Make URL and URL-pattern decoding configurable.
new b08b71e054 Add test cases for the new URL / URL pattern
encoded/decoded option
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 1 +
java/org/apache/catalina/Context.java | 80 ++++++++++++++++-
.../core/ApplicationFilterRegistration.java | 9 +-
.../core/ApplicationServletRegistration.java | 9 +-
java/org/apache/catalina/core/StandardContext.java | 34 ++++++-
.../org/apache/catalina/startup/ContextConfig.java | 22 +++--
.../org/apache/catalina/startup/FailedContext.java | 6 ++
java/org/apache/catalina/startup/Tomcat.java | 6 +-
.../tomcat/util/descriptor/web/ErrorPage.java | 4 +
.../tomcat/util/descriptor/web/FilterMap.java | 4 +
.../descriptor/web/FragmentJarScannerCallback.java | 6 +-
.../util/descriptor/web/JspPropertyGroup.java | 3 +
.../tomcat/util/descriptor/web/LoginConfig.java | 7 ++
.../util/descriptor/web/SecurityCollection.java | 4 +
.../util/descriptor/web/SecurityConstraint.java | 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 61 +++++++++++--
.../apache/tomcat/util/descriptor/web/WebXml.java | 65 +++++++++++---
.../tomcat/util/descriptor/web/WebXmlParser.java | 47 ++++++++--
.../util/descriptor/web/XmlEncodingBase.java | 11 ++-
.../servlet/TestServletRequestParameters.java | 2 +-
...TestServletRequestParametersFormUrlEncoded.java | 2 +-
...stServletRequestParametersMultipartEncoded.java | 2 +-
.../TestServletRequestParametersQueryString.java | 2 +-
.../servlet/annotation/TestServletSecurity.java | 4 +-
.../servlet/http/HttpServletDoHeadBaseTest.java | 4 +-
test/jakarta/servlet/http/TestHttpServlet.java | 20 ++---
.../http/TestHttpServletResponseSendError.java | 8 +-
.../authenticator/TestAuthInfoResponseHeaders.java | 4 +-
.../TestAuthenticatorBaseCorsPreflight.java | 6 +-
.../authenticator/TestDigestAuthenticator.java | 4 +-
.../TestDigestAuthenticatorAlgorithms.java | 4 +-
.../authenticator/TestDigestAuthenticatorB.java | 4 +-
.../authenticator/TestFormAuthenticatorA.java | 6 +-
.../TestNonLoginAndBasicAuthenticator.java | 16 ++--
.../authenticator/TestSSOChangeSessionId.java | 8 +-
.../TestSSOnonLoginAndBasicAuthenticator.java | 16 ++--
.../TestSSOnonLoginAndDigestAuthenticator.java | 12 +--
.../catalina/connector/TestClientReadTimeout.java | 2 +-
.../apache/catalina/connector/TestConnector.java | 6 +-
.../catalina/connector/TestCoyoteAdapter.java | 10 +--
.../TestCoyoteAdapterCanonicalization.java | 2 +-
.../connector/TestCoyoteAdapterRequestFuzzing.java | 2 +-
.../catalina/connector/TestCoyoteInputStream.java | 2 +-
.../catalina/connector/TestCoyoteOutputStream.java | 8 +-
.../apache/catalina/connector/TestInputBuffer.java | 6 +-
.../catalina/connector/TestKeepAliveCount.java | 2 +-
.../catalina/connector/TestMaxConnections.java | 2 +-
.../catalina/connector/TestOutputBuffer.java | 6 +-
.../org/apache/catalina/connector/TestRequest.java | 24 ++---
.../apache/catalina/connector/TestResponse.java | 8 +-
.../apache/catalina/connector/TestSendFile.java | 4 +-
.../connector/TestValidateClientSessionId.java | 6 +-
.../catalina/core/TestApplicationContext.java | 6 +-
...TestApplicationContextGetRequestDispatcher.java | 6 +-
...estApplicationContextGetRequestDispatcherB.java | 4 +-
...estApplicationContextGetRequestDispatcherC.java | 4 +-
.../catalina/core/TestApplicationDispatcher.java | 6 +-
.../catalina/core/TestApplicationFilterConfig.java | 2 +-
.../core/TestApplicationFilterRegistration.java | 52 +++++++++++
.../catalina/core/TestApplicationHttpRequest.java | 8 +-
.../catalina/core/TestApplicationMapping.java | 22 ++---
.../core/TestApplicationServletRegistration.java | 48 ++++++++++
.../apache/catalina/core/TestAsyncContextImpl.java | 100 ++++++++++-----------
.../core/TestAsyncContextImplDispatch.java | 4 +-
.../TestAsyncContextImplListenerOnComplete.java | 2 +-
.../catalina/core/TestAsyncContextIoError.java | 4 +-
.../core/TestAsyncContextStateChanges.java | 2 +-
.../core/TestPropertiesRoleMappingListener.java | 2 +-
.../apache/catalina/core/TestStandardContext.java | 8 +-
.../catalina/core/TestStandardContextAliases.java | 2 +-
.../core/TestStandardContextResources.java | 6 +-
.../catalina/core/TestStandardContextValve.java | 8 +-
.../catalina/core/TestStandardHostValve.java | 10 +--
.../apache/catalina/core/TestStandardWrapper.java | 4 +-
.../catalina/core/TestSwallowAbortedUploads.java | 4 +-
.../catalina/filters/TestAddCharSetFilter.java | 2 +-
.../apache/catalina/filters/TestExpiresFilter.java | 8 +-
.../catalina/filters/TestRateLimitFilter.java | 2 +-
.../TestRateLimitFilterWithExactRateLimiter.java | 2 +-
.../catalina/filters/TestRemoteCIDRFilter.java | 2 +-
.../catalina/filters/TestRemoteIpFilter.java | 10 +--
.../filters/TestRestCsrfPreventionFilter2.java | 6 +-
.../catalina/ha/context/TestReplicatedContext.java | 2 +-
.../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +-
.../loader/TestWebappClassLoaderMemoryLeak.java | 2 +-
...sterWebappClassLoaderThreadLocalMemoryLeak.java | 4 +-
.../catalina/manager/TestHostManagerWebapp.java | 2 +-
.../apache/catalina/manager/TestManagerWebapp.java | 2 +-
.../catalina/manager/TestStatusTransformer.java | 6 +-
.../apache/catalina/mapper/TestMapperWebapps.java | 6 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 22 ++---
test/org/apache/catalina/realm/TestRealmBase.java | 10 +--
.../servlets/DefaultServletEncodingBaseTest.java | 4 +-
.../catalina/servlets/ServletOptionsBaseTest.java | 2 +-
.../catalina/servlets/TestDefaultServlet.java | 24 ++---
.../TestDefaultServletIfMatchRequests.java | 2 +-
.../catalina/servlets/TestDefaultServletPut.java | 2 +-
.../servlets/TestDefaultServletRangeRequests.java | 2 +-
.../TestDefaultServletRfc9110Section13.java | 2 +-
.../TestDefaultServletRfc9110Section14.java | 4 +-
.../catalina/servlets/TestWebdavServlet.java | 22 ++---
.../TestPersistentManagerDataSourceStore.java | 2 +-
.../session/TestPersistentManagerFileStore.java | 2 +-
.../session/TestPersistentManagerIntegration.java | 6 +-
.../session/TestStandardSessionAccessor.java | 2 +-
.../session/TestStandardSessionIntegration.java | 2 +-
.../org/apache/catalina/ssi/TestRegExpCapture.java | 2 +-
test/org/apache/catalina/ssi/TestSsiServlet.java | 4 +-
.../apache/catalina/startup/EmbeddedTomcat.java | 2 +-
.../apache/catalina/startup/TestContextConfig.java | 4 +-
.../startup/TestContextConfigAnnotation.java | 29 +++++-
.../catalina/startup/TestPropertySources.java | 2 +-
.../startup/TestStartupIPv6Connectors.java | 2 +-
test/org/apache/catalina/startup/TestTomcat.java | 12 +--
.../catalina/startup/TestTomcatClassLoader.java | 4 +-
.../catalina/startup/TestTomcatStandalone.java | 2 +-
.../TestUrlPatternsProvidedInDecodedForm.java | 94 +++++++++++++++++++
...ppingParamFilter.java => UrlPatternFilter.java} | 15 ++--
.../startup/UrlPatternServlet.java} | 13 ++-
.../apache/catalina/valves/TestAccessLogValve.java | 2 +-
.../catalina/valves/TestAccessLogValveFile.java | 2 +-
.../catalina/valves/TestErrorReportValve.java | 14 +--
.../valves/TestExtendedAccessLogValve.java | 2 +-
.../apache/catalina/valves/TestFilterValve.java | 6 +-
.../catalina/valves/TestJsonErrorReportValve.java | 24 ++---
.../catalina/valves/TestParameterLimitValve.java | 36 ++++----
.../catalina/valves/TestPersistentValveAsync.java | 10 +--
.../catalina/valves/TestProxyErrorReportValve.java | 24 ++---
.../apache/catalina/valves/TestSemaphoreValve.java | 16 ++--
.../catalina/valves/rewrite/TestRewriteValve.java | 20 ++---
.../webresources/TestWebResourceContentType.java | 2 +-
test/org/apache/coyote/TestAbstractProtocol.java | 2 +-
test/org/apache/coyote/TestIoTimeouts.java | 2 +-
test/org/apache/coyote/TestResponse.java | 4 +-
.../coyote/ajp/TestAbstractAjpProcessor.java | 16 ++--
.../coyote/http11/TestHttp11InputBuffer.java | 10 +--
.../coyote/http11/TestHttp11InputBufferCRLF.java | 2 +-
.../coyote/http11/TestHttp11OutputBuffer.java | 4 +-
.../apache/coyote/http11/TestHttp11Processor.java | 70 +++++++--------
.../coyote/http11/TestHttp11ProcessorDoHead.java | 2 +-
.../http11/filters/TestChunkedInputFilter.java | 26 +++---
.../apache/coyote/http11/upgrade/TestUpgrade.java | 2 +-
.../http11/upgrade/TestUpgradeInternalHandler.java | 2 +-
test/org/apache/coyote/http2/Http2TestBase.java | 10 +--
test/org/apache/coyote/http2/TestAsync.java | 4 +-
test/org/apache/coyote/http2/TestAsyncError.java | 4 +-
test/org/apache/coyote/http2/TestAsyncFlush.java | 4 +-
.../apache/coyote/http2/TestAsyncReadListener.java | 4 +-
test/org/apache/coyote/http2/TestAsyncTimeout.java | 4 +-
.../apache/coyote/http2/TestCancelledUpload.java | 2 +-
.../apache/coyote/http2/TestHttp2AccessLogs.java | 4 +-
.../coyote/http2/TestHttp2UpgradeHandler.java | 8 +-
test/org/apache/coyote/http2/TestLargeUpload.java | 2 +-
.../http2/TestStandardSessionIntegrationHttp2.java | 4 +-
test/org/apache/coyote/http2/TestStream.java | 8 +-
.../apache/coyote/http2/TestStreamProcessor.java | 44 ++++-----
.../apache/coyote/http2/TestStreamQueryString.java | 2 +-
.../apache/jasper/runtime/TestPageContextImpl.java | 2 +-
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
.../apache/juli/TestPerWebappJuliIntegration.java | 4 +-
test/org/apache/naming/TestEnvEntry.java | 2 +-
.../apache/naming/resources/TestNamingContext.java | 10 +--
.../httpd/HttpdIntegrationBaseTest.java | 2 +-
.../integration/httpd/TestErrorHandling.java | 2 +-
.../tomcat/security/TestSecurity2017Ocsp.java | 2 +-
.../apache/tomcat/security/TestSecurity2018.java | 2 +-
.../apache/tomcat/security/TestSecurity2019.java | 8 +-
.../apache/tomcat/security/TestSecurity2023.java | 8 +-
test/org/apache/tomcat/unittest/TesterContext.java | 7 ++
.../web/TestJspPropertyGroupDescriptorImpl.java | 2 +-
.../descriptor/web/TestSecurityConstraint.java | 8 +-
.../tomcat/util/descriptor/web/TestWebXml.java | 5 +-
.../util/descriptor/web/TestWebXmlParser-web.xml | 63 +++++++++++++
.../util/descriptor/web/TestWebXmlParser.java | 67 ++++++++++++++
.../apache/tomcat/util/http/TestCookieParsing.java | 2 +-
.../http/TestCookieProcessorGenerationHttp.java | 4 +-
.../util/http/TestMimeHeadersIntegration.java | 2 +-
.../apache/tomcat/util/net/TestAlpnFallback.java | 2 +-
.../tomcat/util/net/TestLargeClientHello.java | 2 +-
test/org/apache/tomcat/util/net/TestPQC.java | 2 +-
.../tomcat/util/net/TestSSLHostConfigCipher.java | 2 +-
.../tomcat/util/net/TestSSLHostConfigCompat.java | 2 +-
.../tomcat/util/net/TestSSLHostConfigProtocol.java | 4 +-
test/org/apache/tomcat/util/net/TestSsl.java | 6 +-
.../tomcat/util/net/TestSslHandshakeFailure.java | 2 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 6 +-
.../apache/tomcat/util/net/ocsp/OcspBaseTest.java | 2 +-
.../tomcat/util/net/ocsp/TesterOcspResponder.java | 2 +-
.../tomcat/websocket/TestWebSocketFrameClient.java | 14 +--
.../websocket/TestWebSocketFrameClientSSL.java | 4 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 2 +-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +-
.../websocket/TestWsSessionSuspendResume.java | 4 +-
.../tomcat/websocket/TestWsSubprotocols.java | 2 +-
.../tomcat/websocket/TestWsWebSocketContainer.java | 14 +--
.../TestWsWebSocketContainerGetOpenSessions.java | 2 +-
.../websocket/TestWsWebSocketContainerSSL.java | 2 +-
...ocketContainerSessionExpiryContainerClient.java | 2 +-
...ocketContainerSessionExpiryContainerServer.java | 2 +-
...stWsWebSocketContainerSessionExpirySession.java | 2 +-
.../TestWsWebSocketContainerTimeoutClient.java | 2 +-
.../TestWsWebSocketContainerTimeoutServer.java | 2 +-
.../TesterConnectionLimitPerformance.java | 2 +-
.../websocket/TesterWebSocketClientProxy.java | 4 +-
.../apache/tomcat/websocket/WebSocketBaseTest.java | 2 +-
.../websocket/pojo/TestEncodingDecoding.java | 12 +--
.../websocket/pojo/TestPojoEndpointBase.java | 4 +-
.../websocket/pojo/TestPojoMethodMapping.java | 2 +-
.../server/TestAsyncMessagesPerformance.java | 2 +-
.../tomcat/websocket/server/TestClassLoader.java | 2 +-
.../tomcat/websocket/server/TestCloseBug58624.java | 2 +-
.../tomcat/websocket/server/TestShutdown.java | 2 +-
.../tomcat/websocket/server/TestSlowClient.java | 2 +-
.../TestWsRemoteEndpointImplServerDeadlock.java | 2 +-
.../websocket/server/TestWsServerContainer.java | 4 +-
.../server/TesterWsRemoteEndpointImplServer.java | 2 +-
.../WEB-INF/web.xml | 44 ++++++---
webapps/docs/changelog.xml | 14 +++
webapps/docs/config/context.xml | 16 ++++
219 files changed, 1383 insertions(+), 694 deletions(-)
create mode 100644
test/org/apache/catalina/core/TestApplicationFilterRegistration.java
create mode 100644
test/org/apache/catalina/core/TestApplicationServletRegistration.java
create mode 100644
test/org/apache/catalina/startup/TestUrlPatternsProvidedInDecodedForm.java
copy test/org/apache/catalina/startup/{DuplicateMappingParamFilter.java =>
UrlPatternFilter.java} (75%)
copy test/org/apache/{jasper/compiler/TesterTag.java =>
catalina/startup/UrlPatternServlet.java} (78%)
create mode 100644
test/org/apache/tomcat/util/descriptor/web/TestWebXmlParser-web.xml
create mode 100644
test/org/apache/tomcat/util/descriptor/web/TestWebXmlParser.java
copy test/{webapp-6.0 => webapp-url-patterns}/WEB-INF/web.xml (53%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]