This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c2ae943828bfe19179318d98701a140f0514a9ea
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 20 08:55:53 2019 +0100
Polish
---
java/org/apache/tomcat/util/http/CookieProcessorBase.java | 12 ++++++------
java/org/apache/tomcat/util/http/LocalStrings.properties | 2 +-
webapps/docs/config/cookie-processor.xml | 9 ++++++---
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/CookieProcessorBase.java
b/java/org/apache/tomcat/util/http/CookieProcessorBase.java
index aad3979..3cb5430 100644
--- a/java/org/apache/tomcat/util/http/CookieProcessorBase.java
+++ b/java/org/apache/tomcat/util/http/CookieProcessorBase.java
@@ -37,6 +37,12 @@ public abstract class CookieProcessorBase implements
CookieProcessor {
}
};
+ protected static final String ANCIENT_DATE;
+
+ static {
+ ANCIENT_DATE = COOKIE_DATE_FORMAT.get().format(new Date(10000));
+ }
+
private SameSiteCookies sameSiteCookies = SameSiteCookies.NONE;
public SameSiteCookies getSameSiteCookies() {
@@ -46,10 +52,4 @@ public abstract class CookieProcessorBase implements
CookieProcessor {
public void setSameSiteCookies(String sameSiteCookies) {
this.sameSiteCookies = SameSiteCookies.fromString(sameSiteCookies);
}
-
- protected static final String ANCIENT_DATE;
-
- static {
- ANCIENT_DATE = COOKIE_DATE_FORMAT.get().format(new Date(10000));
- }
}
diff --git a/java/org/apache/tomcat/util/http/LocalStrings.properties
b/java/org/apache/tomcat/util/http/LocalStrings.properties
index e7d3a54..17211a3 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings.properties
@@ -16,9 +16,9 @@
cookies.fallToDebug=\n\
\ Note: further occurrences of Cookie errors will be logged at DEBUG level.
cookies.invalidCookieToken=Cookies: Invalid cookie. Value not a token or
quoted value
+cookies.invalidSameSiteCookies=Unknown setting [{0}], must be one of: none,
lax, strict. Default value is none.
cookies.invalidSpecial=Cookies: Unknown Special Cookie
cookies.maxCountFail=More than the maximum allowed number of cookies, [{0}],
were detected.
-cookies.invalidSameSiteCookies=Unknown setting [{0}], must be one of: none,
lax, strict. Default value is none.
headers.maxCountFail=More than the maximum allowed number of headers, [{0}],
were detected.
diff --git a/webapps/docs/config/cookie-processor.xml
b/webapps/docs/config/cookie-processor.xml
index 29e4809..2d9f004 100644
--- a/webapps/docs/config/cookie-processor.xml
+++ b/webapps/docs/config/cookie-processor.xml
@@ -67,11 +67,14 @@
<attribute name="sameSiteCookies" required="false">
<p>Enables setting same-site cookie attribute.</p>
- <p>If value is <code>none</code> then the same-site cookie attribute
won't be set. This is the default value.</p>
+ <p>If value is <code>none</code> then the same-site cookie attribute
+ won't be set. This is the default value.</p>
- <p>If value is <code>lax</code> then the browser only sends the cookie
in same-site requests and cross-site top level GET requests. </p>
+ <p>If value is <code>lax</code> then the browser only sends the cookie
+ in same-site requests and cross-site top level GET requests.</p>
- <p>If value is <code>strict</code> then the browser prevents sending
the cookie in any cross-site request.</p>
+ <p>If value is <code>strict</code> then the browser prevents sending
the
+ cookie in any cross-site request.</p>
</attribute>
</attributes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
