This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new a646ab097b Modify fix for BZ69836
a646ab097b is described below
commit a646ab097b515aea527a6c1019881c29269a7e0e
Author: remm <[email protected]>
AuthorDate: Tue Oct 7 15:06:12 2025 +0200
Modify fix for BZ69836
Found while merging to 10.1 that the issue came from an intentional
change.
---
java/org/apache/catalina/core/ApplicationSessionCookieConfig.java | 4 +++-
java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java | 2 +-
test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
index f0fd66cb5a..dd0d842736 100644
--- a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
+++ b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
@@ -221,7 +221,9 @@ public class ApplicationSessionCookieConfig implements
SessionCookieConfig {
cookie.setHttpOnly(true);
}
- cookie.setAttribute(Constants.COOKIE_PARTITIONED_ATTR,
Boolean.toString(context.getUsePartitioned()));
+ if (context.getUsePartitioned()) {
+ cookie.setAttribute(Constants.COOKIE_PARTITIONED_ATTR, "");
+ }
cookie.setPath(SessionConfig.getSessionCookiePath(context));
diff --git a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
index 8f0b3bb40d..877d5e41ca 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -185,7 +185,7 @@ public class Rfc6265CookieProcessor extends
CookieProcessorBase {
header.append("; Partitioned");
}
} else {
- if (EMPTY_STRING.equals(cookiePartitioned) ||
Boolean.parseBoolean(cookiePartitioned)) {
+ if (EMPTY_STRING.equals(cookiePartitioned)) {
header.append("; Partitioned");
}
}
diff --git
a/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
b/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
index 4f95452e89..78d1792b7d 100644
--- a/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
+++ b/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
@@ -250,7 +250,7 @@ public class TestCookieProcessorGeneration {
rfc6265.setPartitioned(false);
cookie.setAttribute(Constants.COOKIE_PARTITIONED_ATTR, "true");
- Assert.assertEquals("foo=bar; Secure; HttpOnly; Partitioned",
rfc6265.generateHeader(cookie, null));
+ Assert.assertEquals("foo=bar; Secure; HttpOnly",
rfc6265.generateHeader(cookie, null));
cookie.setAttribute(Constants.COOKIE_PARTITIONED_ATTR, "false");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
