This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new daca52e225 Follow up to reverting custom URL handler for war
daca52e225 is described below
commit daca52e2258f6e693ab0e557bd2e3ff19c4ce8a8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 27 16:44:30 2023 +0000
Follow up to reverting custom URL handler for war
Reviewed 9.0.x / 10.0.x / 11.0.x diff and aligned code
---
build.xml | 6 ++----
webapps/docs/changelog.xml | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index e07317e76d..ef15f37441 100644
--- a/build.xml
+++ b/build.xml
@@ -1032,16 +1032,14 @@
<filter token="annotation.revision" value="${annotation.revision}"/>
<mkdir dir="${tomcat.manifests}" />
- <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
- encoding="ISO-8859-1">
+ <copy todir="${tomcat.manifests}" overwrite="yes" filtering="yes"
encoding="ISO-8859-1">
<filterset refid="version.filters"/>
<fileset dir="${tomcat.home}/res/META-INF" />
</copy>
<!-- Ensure text files in JARs have consistent line endings. Required for
reproducible builds. -->
- <fixcrlf srcdir="${tomcat.manifests}" eol="lf"
- encoding="ISO-8859-1" fixlast="false" >
+ <fixcrlf srcdir="${tomcat.manifests}" eol="lf" encoding="ISO-8859-1"
fixlast="false" >
<patternset refid="text.files" />
</fixcrlf>
</target>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec285a6744..0ee8e640cd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,11 +117,11 @@
</subsection>
<subsection name="Catalina">
<changelog>
- <update>
+ <add>
Add support for <code>txt:</code> and <code>rnd:</code> rewrite map
types from mod_rewrite. Based on a pull request <pr>591</pr>
- provided by Dimitrios Soumis. (markt)
- </update>
+ provided by Dimitrios Soumis. (remm)
+ </add>
<update>
Provide a more appropriate response (501 rather than 400) when
rejecting
an HTTP request using the CONNECT method. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
