This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a5606109e8 Add entry removed in error during resolution of merge
conflict
a5606109e8 is described below
commit a5606109e8bbf46ac38c9381801eaee609b8550d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 27 21:04:28 2023 +0000
Add entry removed in error during resolution of merge conflict
---
webapps/docs/changelog.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3f5e5e52a2..673cac413c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,12 @@
Provide a more appropriate response (501 rather than 400) when
rejecting
an HTTP request using the CONNECT method. (markt)
</update>
+ <fix>
+ <bug>66488</bug>: Correct a regression introduced in the fix for bug
+ <bug>66196</bug> that meant that the HTTP headers and/or request line
+ could get corrupted (one part overwriting another part) within a single
+ request. (markt)
+ </fix>
<fix>
<bug>66491</bug>: Revert the switch to using the ServiceLoader
mechanism
to load the custom URL protocol handlers that Tomcat uses. The original
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
