You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/02/14 22:30:09 UTC
[tomcat] branch master updated: Add jakarta attributes to the map
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 4bca1ff Add jakarta attributes to the map
4bca1ff is described below
commit 4bca1ff80d6da1b042a2192d041f47d989ca2a2f
Author: remm <re...@apache.org>
AuthorDate: Fri Feb 14 23:29:54 2020 +0100
Add jakarta attributes to the map
Otherwise only javax attributes converted to jakarta would be accepted.
I suppose the AJP client is not going to use jakarta for now but this
doesn't really feel right to not do it.
---
java/org/apache/coyote/ajp/AjpProcessor.java | 4 ++++
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 28f8c25..ebe1353 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -129,6 +129,10 @@ public class AjpProcessor extends AbstractProcessor {
// Build Map of Java Servlet to Jakarta Servlet attribute names
Map<String,String> m = new HashMap<>();
+ m.put("jakarta.servlet.request.cipher_suite", "jakarta.servlet.request.cipher_suite");
+ m.put("jakarta.servlet.request.key_size", "jakarta.servlet.request.key_size");
+ m.put("jakarta.servlet.request.ssl_session", "jakarta.servlet.request.ssl_session");
+ m.put("jakarta.servlet.request.X509Certificate", "jakarta.servlet.request.X509Certificate");
m.put("javax.servlet.request.cipher_suite", "jakarta.servlet.request.cipher_suite");
m.put("javax.servlet.request.key_size", "jakarta.servlet.request.key_size");
m.put("javax.servlet.request.ssl_session", "jakarta.servlet.request.ssl_session");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 713b05b..753fb4c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 10.0.0-M2 (markt)" rtext="in development">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Fix support of native jakarta servlet attributes in AJP connector.
+ (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.0-M1 (markt)" rtext="release in progress">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org