[tomcat] branch master updated: Managed to delete this. Sorry for the noise
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 The following commit(s) were added to refs/heads/master by this push: new 8bb2553 Managed to delete this. Sorry for the noise 8bb2553 is described below commit 8bb2553866cff2cfbfdb556ffcacd9a326c0a92b Author: Mark Thomas AuthorDate: Thu Nov 19 17:06:08 2020 + Managed to delete this. Sorry for the noise --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 957a55c..0cd5d13 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -413,6 +413,7 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[tomcat] branch 9.0.x updated: Follow-up to e863f54 for NIO2
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 e7b8d96 Follow-up to e863f54 for NIO2 e7b8d96 is described below commit e7b8d96009eb3fc10aee4d8c6e3339b6493301cb Author: Mark Thomas AuthorDate: Thu Nov 19 17:02:03 2020 + Follow-up to e863f54 for NIO2 --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 18ead41..e45761e 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -419,8 +419,13 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[tomcat] branch 9.0.x updated: Managed to delete this. Sorry for the noise
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 5bbe35c Managed to delete this. Sorry for the noise 5bbe35c is described below commit 5bbe35c7039f3f78862ee334f2abf06b600e95dd Author: Mark Thomas AuthorDate: Thu Nov 19 17:06:08 2020 + Managed to delete this. Sorry for the noise --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index e45761e..02e8c16 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -425,6 +425,7 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[tomcat] branch master updated: Follow-up to e863f54 for NIO2
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 The following commit(s) were added to refs/heads/master by this push: new f46cf05 Follow-up to e863f54 for NIO2 f46cf05 is described below commit f46cf05337bae707f567145d757269b75219c81b Author: Mark Thomas AuthorDate: Thu Nov 19 17:02:03 2020 + Follow-up to e863f54 for NIO2 --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 5741498..957a55c 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -407,8 +407,13 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[Bug 64921] LoadBalancerDrainingValve does not honour "Secure Session Cookie" settings
https://bz.apache.org/bugzilla/show_bug.cgi?id=64921 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.0-M11 onwards - 9.0.x for 9.0.41 onwards - 8.5.x for 8.5.61 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 375e35c Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie
secure attr
375e35c is described below
commit 375e35c11d0b52ad9be1e888ec410196a819c0c9
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:49:05 2020 +
Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
.../catalina/valves/LoadBalancerDrainingValve.java | 4
.../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
webapps/docs/changelog.xml | 9 +
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 002013b..d2bf9d4 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import javax.servlet.ServletException;
+import javax.servlet.SessionCookieConfig;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
sessionCookie.setMaxAge(0); // Delete
sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session
cookies
+SessionCookieConfig sessionCookieConfig =
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() ||
sessionCookieConfig.isSecure());
response.addCookie(sessionCookie);
}
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 9f32f11..a7b710c 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
validSessionId.booleanValue());
for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] {
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString,
secureRequest, secureSessionConfig});
+}
+}
}
}
}
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
@Parameter(4)
public String queryString;
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
@Test
public void runValve() throws Exception {
IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
cookieConfig.setDomain("example.com");
cookieConfig.setName(sessionCookieName);
cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
// Valve.init requires all of this stuff
EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
expectedCookie.setPath(cookieConfig.getPath());
expectedCookie.setMaxAge(0);
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
// These two lines just mean
EasyMock.expect(response.addCookie) but for a void method
response.addCookie(expectedCookie);
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); //
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0983f71..443c857 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,15 @@
issues do not "
[tomcat] branch 9.0.x updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
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 9c659dd Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie
secure attr
9c659dd is described below
commit 9c659dd2ae3b617517539e647ca7fd1ab03276fe
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:49:05 2020 +
Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
.../catalina/valves/LoadBalancerDrainingValve.java | 4
.../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
webapps/docs/changelog.xml | 9 +
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 002013b..d2bf9d4 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import javax.servlet.ServletException;
+import javax.servlet.SessionCookieConfig;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
sessionCookie.setMaxAge(0); // Delete
sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session
cookies
+SessionCookieConfig sessionCookieConfig =
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() ||
sessionCookieConfig.isSecure());
response.addCookie(sessionCookie);
}
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 9f32f11..a7b710c 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
validSessionId.booleanValue());
for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] {
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString,
secureRequest, secureSessionConfig});
+}
+}
}
}
}
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
@Parameter(4)
public String queryString;
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
@Test
public void runValve() throws Exception {
IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
cookieConfig.setDomain("example.com");
cookieConfig.setName(sessionCookieName);
cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
// Valve.init requires all of this stuff
EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
expectedCookie.setPath(cookieConfig.getPath());
expectedCookie.setMaxAge(0);
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
// These two lines just mean
EasyMock.expect(response.addCookie) but for a void method
response.addCookie(expectedCookie);
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); //
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5857785..1555f20 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,15 @@
issues do not "
[GitHub] [tomcat] markt-asf closed pull request #377: Set "Secure" session cookie attribute if called under SSL.
markt-asf closed pull request #377: URL: https://github.com/apache/tomcat/pull/377 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #377: Set "Secure" session cookie attribute if called under SSL.
markt-asf commented on pull request #377: URL: https://github.com/apache/tomcat/pull/377#issuecomment-730424887 Thanks for the PR. I have implemented a variation of this in 10.0.x and will back-port to 9.0.x and 8.5.x. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
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
The following commit(s) were added to refs/heads/master by this push:
new fe8472d Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie
secure attr
fe8472d is described below
commit fe8472d62b11a027d0fc1ec10c8849fc4ef639a9
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:49:05 2020 +
Fix BZ 64921. LoadBalancerDrainingValve sets correct cookie secure attr
https://bz.apache.org/bugzilla/show_bug.cgi?id=64921
Based on a pull request by Andreas Kurth
---
.../catalina/valves/LoadBalancerDrainingValve.java | 4
.../catalina/valves/TestLoadBalancerDrainingValve.java | 18 --
webapps/docs/changelog.xml | 9 +
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 1d6b8be..7ef9386 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import jakarta.servlet.ServletException;
+import jakarta.servlet.SessionCookieConfig;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
@@ -222,6 +223,9 @@ public class LoadBalancerDrainingValve extends ValveBase {
sessionCookie.setPath(SessionConfig.getSessionCookiePath(request.getContext()));
sessionCookie.setMaxAge(0); // Delete
sessionCookie.setValue(""); // Purge the cookie's value
+// Replicate logic used to set secure attribute for session
cookies
+SessionCookieConfig sessionCookieConfig =
request.getContext().getServletContext().getSessionCookieConfig();
+sessionCookie.setSecure(request.isSecure() ||
sessionCookieConfig.isSecure());
response.addCookie(sessionCookie);
}
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index a45d274..7c670bc 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -55,8 +55,12 @@ public class TestLoadBalancerDrainingValve {
Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
validSessionId.booleanValue());
for (String queryString : queryStrings) {
-parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
-enableIgnore, queryString});
+for (Boolean secureRequest : booleans) {
+for (Boolean secureSessionConfig : booleans) {
+parameterSets.add(new Object[] {
jkActivation, validSessionId, expectInvokeNext,
+enableIgnore, queryString,
secureRequest, secureSessionConfig});
+}
+}
}
}
}
@@ -80,6 +84,13 @@ public class TestLoadBalancerDrainingValve {
@Parameter(4)
public String queryString;
+@Parameter(5)
+public Boolean secureRequest;
+
+@Parameter(6)
+public boolean secureSessionConfig;
+
+
@Test
public void runValve() throws Exception {
IMocksControl control = EasyMock.createControl();
@@ -95,6 +106,7 @@ public class TestLoadBalancerDrainingValve {
cookieConfig.setDomain("example.com");
cookieConfig.setName(sessionCookieName);
cookieConfig.setPath("/");
+cookieConfig.setSecure(secureSessionConfig);
// Valve.init requires all of this stuff
EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
@@ -137,6 +149,8 @@ public class TestLoadBalancerDrainingValve {
expectedCookie.setPath(cookieConfig.getPath());
expectedCookie.setMaxAge(0);
+
EasyMock.expect(Boolean.valueOf(request.isSecure())).andReturn(secureRequest);
+
// These two lines just mean
EasyMock.expect(response.addCookie) but for a void method
response.addCookie(expectedCookie);
EasyMock.expect(ctx.getSessionCookieName()).andReturn(sessionCookieName); //
Indirect call
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8d615bc..3ad87f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,15 @@
issue
[tomcat] branch 8.5.x updated: Parameterise test for LoadBalancerDrainingValve
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new b2f4440 Parameterise test for LoadBalancerDrainingValve
b2f4440 is described below
commit b2f444052c9f6acc5de7027fb6594a30b6072e22
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:37:02 2020 +
Parameterise test for LoadBalancerDrainingValve
---
.../valves/TestLoadBalancerDrainingValve.java | 266 +++--
1 file changed, 136 insertions(+), 130 deletions(-)
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 0c5694c..9f32f11 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
package org.apache.catalina.valves;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import javax.servlet.ServletContext;
@@ -23,6 +24,10 @@ import javax.servlet.SessionCookieConfig;
import javax.servlet.http.Cookie;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
import org.apache.catalina.Context;
import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+@RunWith(Parameterized.class)
public class TestLoadBalancerDrainingValve {
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}],
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext =
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMock.expect(Boolean.valueOf(request.isRequestedSessionIdValid())).andStubReturn(Boolean.valueOf(validSessionId));
+
+ArrayList cookies = new ArrayList<>();
+
[tomcat] branch 9.0.x updated: Parameterise test for LoadBalancerDrainingValve
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 6e68b62 Parameterise test for LoadBalancerDrainingValve
6e68b62 is described below
commit 6e68b62cd11e2ecdd0658f9ed7bdd34eabf218bd
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:37:02 2020 +
Parameterise test for LoadBalancerDrainingValve
---
.../valves/TestLoadBalancerDrainingValve.java | 266 +++--
1 file changed, 136 insertions(+), 130 deletions(-)
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 0c5694c..9f32f11 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
package org.apache.catalina.valves;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import javax.servlet.ServletContext;
@@ -23,6 +24,10 @@ import javax.servlet.SessionCookieConfig;
import javax.servlet.http.Cookie;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
import org.apache.catalina.Context;
import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+@RunWith(Parameterized.class)
public class TestLoadBalancerDrainingValve {
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}],
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext =
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMock.expect(Boolean.valueOf(request.isRequestedSessionIdValid())).andStubReturn(Boolean.valueOf(validSessionId));
+
+ArrayList cookies = new ArrayList<>();
+
[tomcat] branch master updated: Parameterise test for LoadBalancerDrainingValve
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
The following commit(s) were added to refs/heads/master by this push:
new d1a23ea Parameterise test for LoadBalancerDrainingValve
d1a23ea is described below
commit d1a23ea387acae51b75776f67726f176342f9329
Author: Mark Thomas
AuthorDate: Thu Nov 19 14:37:02 2020 +
Parameterise test for LoadBalancerDrainingValve
---
.../valves/TestLoadBalancerDrainingValve.java | 266 +++--
1 file changed, 136 insertions(+), 130 deletions(-)
diff --git a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
index 4557953..a45d274 100644
--- a/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
+++ b/test/org/apache/catalina/valves/TestLoadBalancerDrainingValve.java
@@ -16,6 +16,7 @@
package org.apache.catalina.valves;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import jakarta.servlet.ServletContext;
@@ -23,6 +24,10 @@ import jakarta.servlet.SessionCookieConfig;
import jakarta.servlet.http.Cookie;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
import org.apache.catalina.Context;
import org.apache.catalina.Valve;
@@ -32,28 +37,143 @@ import org.apache.catalina.core.StandardPipeline;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
+@RunWith(Parameterized.class)
public class TestLoadBalancerDrainingValve {
-static class MockResponse extends Response {
-private List cookies;
-@Override
-public boolean isCommitted() {
-return false;
+@Parameters(name = "{index}: activation[{0}], validSessionID[{1}],
expectInvokeNext[{2}], enableIgnore[{3}], " +
+"queryString[{4}]")
+public static Collection parameters() {
+
+String[] jkActivations = new String[] { "ACT", "DIS" };
+Boolean[] booleans = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
+String[] queryStrings = new String[] { null, "foo=bar" };
+
+List parameterSets = new ArrayList<>();
+for (String jkActivation : jkActivations) {
+for (Boolean validSessionId : booleans) {
+for (Boolean enableIgnore : booleans) {
+Boolean expectInvokeNext =
Boolean.valueOf("ACT".equals(jkActivation) || enableIgnore.booleanValue() ||
+validSessionId.booleanValue());
+for (String queryString : queryStrings) {
+parameterSets.add(new Object[] { jkActivation,
validSessionId, expectInvokeNext,
+enableIgnore, queryString});
+}
+}
+}
+}
+return parameterSets;
+}
+
+
+@Parameter(0)
+public String jkActivation;
+
+@Parameter(1)
+public boolean validSessionId;
+
+@Parameter(2)
+public boolean expectInvokeNext;
+
+@Parameter(3)
+public boolean enableIgnore;
+
+@Parameter(4)
+public String queryString;
+
+@Test
+public void runValve() throws Exception {
+IMocksControl control = EasyMock.createControl();
+ServletContext servletContext =
control.createMock(ServletContext.class);
+Context ctx = control.createMock(Context.class);
+Request request = control.createMock(Request.class);
+Response response = control.createMock(Response.class);
+
+String sessionCookieName = "JSESSIONID";
+String sessionId = "cafebabe";
+String requestURI = "/test/path";
+SessionCookieConfig cookieConfig = new CookieConfig();
+cookieConfig.setDomain("example.com");
+cookieConfig.setName(sessionCookieName);
+cookieConfig.setPath("/");
+
+// Valve.init requires all of this stuff
+EasyMock.expect(ctx.getMBeanKeyProperties()).andStubReturn("");
+EasyMock.expect(ctx.getName()).andStubReturn("");
+EasyMock.expect(ctx.getPipeline()).andStubReturn(new
StandardPipeline());
+EasyMock.expect(ctx.getDomain()).andStubReturn("foo");
+
EasyMock.expect(ctx.getLogger()).andStubReturn(org.apache.juli.logging.LogFactory.getLog(LoadBalancerDrainingValve.class));
+EasyMock.expect(ctx.getServletContext()).andStubReturn(servletContext);
+
+// Set up the actual test
+
EasyMock.expect(request.getAttribute(LoadBalancerDrainingValve.ATTRIBUTE_KEY_JK_LB_ACTIVATION)).andStubReturn(jkActivation);
+
EasyMock.expect(Boolean.valueOf(request.isRequestedSessionIdValid())).andStubReturn(Boolean.valueOf(validSessionId));
+
+ArrayList cookies = new ArrayList
[tomcat] branch 8.5.x updated: Remove unused mbean definition
This is an automated email from the ASF dual-hosted git repository. kfujino pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 82a7cad Remove unused mbean definition 82a7cad is described below commit 82a7cad8c0aa003459c6f0b86448085c982300ff Author: KeiichiFujino AuthorDate: Thu Nov 19 22:14:04 2020 +0900 Remove unused mbean definition --- .../tribes/membership/mbeans-descriptors.xml | 73 -- 1 file changed, 73 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml index d576390..42af9db 100644 --- a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml +++ b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml @@ -20,79 +20,6 @@ "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> - - - - - - - - - - - - - - - - -
[tomcat] branch 9.0.x updated: Remove unused mbean definition
This is an automated email from the ASF dual-hosted git repository. kfujino 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 93ded83 Remove unused mbean definition 93ded83 is described below commit 93ded83cb9b792c90b103e2caed33c62c1756316 Author: KeiichiFujino AuthorDate: Thu Nov 19 22:07:55 2020 +0900 Remove unused mbean definition --- .../tribes/membership/mbeans-descriptors.xml | 73 -- 1 file changed, 73 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml index d576390..42af9db 100644 --- a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml +++ b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml @@ -20,79 +20,6 @@ "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> - - - - - - - - - - - - - - - - -
[tomcat] branch master updated: Remove unused mbean definition
This is an automated email from the ASF dual-hosted git repository. kfujino 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 9856bc9 Remove unused mbean definition 9856bc9 is described below commit 9856bc93ec64ca74d7a1987ba0d3fc75674d792e Author: KeiichiFujino AuthorDate: Thu Nov 19 21:59:30 2020 +0900 Remove unused mbean definition --- .../tribes/membership/mbeans-descriptors.xml | 73 -- 1 file changed, 73 deletions(-) diff --git a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml index d576390..42af9db 100644 --- a/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml +++ b/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml @@ -20,79 +20,6 @@ "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> - - - - - - - - - - - - - - - - -
[GitHub] [tomcat] markt-asf commented on pull request #323: fix module names to reflect Jakarta EE origin
markt-asf commented on pull request #323: URL: https://github.com/apache/tomcat/pull/323#issuecomment-730329196 This has been addressed in 10.0.x and 9.0.x. Note there nay be another change for 10.1.x depending on what naming convention Jakarta EE adopts. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #323: fix module names to reflect Jakarta EE origin
markt-asf closed pull request #323: URL: https://github.com/apache/tomcat/pull/323 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add release date for 8.5.60
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new eecc8c8 Add release date for 8.5.60 eecc8c8 is described below commit eecc8c864a8da3371184a01eeab32d8c2d2a6146 Author: Mark Thomas AuthorDate: Thu Nov 19 11:14:22 2020 + Add release date for 8.5.60 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index efadd26..0983f71 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,7 +113,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date for 9.0.40
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 52b76c2 Add release date for 9.0.40 52b76c2 is described below commit 52b76c2f44716d90c25033932e21aec5f16a5611 Author: Mark Thomas AuthorDate: Thu Nov 19 11:13:34 2020 + Add release date for 9.0.40 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2d62b47..5857785 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,7 +119,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (3f3150f -> a330f8e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3f3150f Followup for bug 64931 - Declare additional elements used in other versions of Tomcat. add a330f8e Add release date for 10.0.0-M10 No new revisions were added by this update. Summary of changes: webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date for 9.0.40
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 52b76c2 Add release date for 9.0.40 52b76c2 is described below commit 52b76c2f44716d90c25033932e21aec5f16a5611 Author: Mark Thomas AuthorDate: Thu Nov 19 11:13:34 2020 + Add release date for 9.0.40 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2d62b47..5857785 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,7 +119,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add release date for 8.5.60
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new eecc8c8 Add release date for 8.5.60 eecc8c8 is described below commit eecc8c864a8da3371184a01eeab32d8c2d2a6146 Author: Mark Thomas AuthorDate: Thu Nov 19 11:14:22 2020 + Add release date for 8.5.60 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index efadd26..0983f71 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,7 +113,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (3f3150f -> a330f8e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3f3150f Followup for bug 64931 - Declare additional elements used in other versions of Tomcat. add a330f8e Add release date for 10.0.0-M10 No new revisions were added by this update. Summary of changes: webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on a change in pull request #378: use a single `Thread` to do `async-delete-file` works instead of `ThreadPoolExecutor`
martin-g commented on a change in pull request #378:
URL: https://github.com/apache/tomcat/pull/378#discussion_r526794048
##
File path: java/org/apache/juli/FileHandler.java
##
@@ -18,37 +18,20 @@
package org.apache.juli;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
Review comment:
Please don't use wildcard imports
##
File path: java/org/apache/juli/FileHandler.java
##
@@ -58,98 +41,48 @@
* The following configuration properties are available:
*
*
- * directory - The directory where to create the log file.
- *If the path is not absolute, it is relative to the current working
- *directory of the application. The Apache Tomcat configuration files
usually
- *specify an absolute path for this property,
- *${catalina.base}/logs
- *Default value: logs
- * rotatable - If true, the log file will be
- *rotated on the first write past midnight and the filename will be
- *{prefix}{date}{suffix}, where date is -MM-dd. If
false,
- *the file will not be rotated and the filename will be
{prefix}{suffix}.
- *Default value: true
- * prefix - The leading part of the log file name.
- *Default value: juli.
- * suffix - The trailing part of the log file name. Default
value: .log
- * bufferSize - Configures buffering. The value of
0
- *uses system default buffering (typically an 8K buffer will be used). A
- *value of <0 forces a writer flush upon each log write. A
- *value >0 uses a BufferedOutputStream with the defined
- *value but note that the system default buffering will also be
- *applied. Default value: -1
- * encoding - Character set used by the log file. Default
value:
- *empty string, which means to use the system default character set.
- * level - The level threshold for this Handler. See the
- *java.util.logging.Level class for the possible levels.
- *Default value: ALL
- * filter - The java.util.logging.Filter
- *implementation class name for this Handler. Default value: unset
- * formatter - The java.util.logging.Formatter
- *implementation class name for this Handler. Default value:
- *java.util.logging.SimpleFormatter
- * maxDays - The maximum number of days to keep the log
- *files. If the specified value is <=0 then the log files
- *will be kept on the file system forever, otherwise they will be kept the
- *specified maximum days. Default value: -1.
+ * directory - The directory where to create the log file.
+ * If the path is not absolute, it is relative to the current working
+ * directory of the application. The Apache Tomcat configuration files usually
+ * specify an absolute path for this property,
+ * ${catalina.base}/logs
+ * Default value: logs
+ * rotatable - If true, the log file will be
+ * rotated on the first write past midnight and the filename will be
+ * {prefix}{date}{suffix}, where date is -MM-dd. If
false,
+ * the file will not be rotated and the filename will be
{prefix}{suffix}.
+ * Default value: true
+ * prefix - The leading part of the log file name.
+ * Default value: juli.
+ * suffix - The trailing part of the log file name. Default
value: .log
+ * bufferSize - Configures buffering. The value of
0
+ * uses system default buffering (typically an 8K buffer will be used). A
+ * value of <0 forces a writer flush upon each log write. A
+ * value >0 uses a BufferedOutputStream with the defined
+ * value but note that the system default buffering will also be
+ * applied. Default value: -1
+ * encoding - Character set used by the log file. Default
value:
+ * empty string, which means to use the system default character set.
+ * level - The level threshold for this Handler. See the
+ * java.util.logging.Level class for the possible levels.
+ * Default value: ALL
+ * filter - The java.util.logging.Filter
+ * implementation class name for this Handler. Default value: unset
+ * formatter - The java.util.logging.Formatter
+ * implementation class name for this Handler. Default value:
+ * java.util.logging.SimpleFormatter
+ * maxDays - The maximum number of days to keep the log
+ * files. If the specified value is <=0 then the log files
+ * will be kept on the file system forever, otherwise they will be kept the
+ * specified maximum days. Default value: -1.
Review comment:
Whitespace changes which are not really needed.
##
File path: java/org/apache/juli/FileHandler.java
##
@@ -585,4 +517,34 @@ private String obtainDateFromPath(Path path) {
return null;
}
}
+
+
+static class AsyncTaskExecutor {
+
+private Thread thread;
+private BlockingQueue tasks;
+
+AsyncTaskExecutor() {
+this.tas
[tomcat] branch 8.5.x updated: Add release date for 8.5.60
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new eecc8c8 Add release date for 8.5.60 eecc8c8 is described below commit eecc8c864a8da3371184a01eeab32d8c2d2a6146 Author: Mark Thomas AuthorDate: Thu Nov 19 11:14:22 2020 + Add release date for 8.5.60 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index efadd26..0983f71 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,7 +113,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add release date for 9.0.40
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 52b76c2 Add release date for 9.0.40 52b76c2 is described below commit 52b76c2f44716d90c25033932e21aec5f16a5611 Author: Mark Thomas AuthorDate: Thu Nov 19 11:13:34 2020 + Add release date for 9.0.40 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 2d62b47..5857785 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,7 +119,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (3f3150f -> a330f8e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 3f3150f Followup for bug 64931 - Declare additional elements used in other versions of Tomcat. add a330f8e Add release date for 10.0.0-M10 No new revisions were added by this update. Summary of changes: webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add release date for 10.0.0-M10
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 The following commit(s) were added to refs/heads/master by this push: new a330f8e Add release date for 10.0.0-M10 a330f8e is described below commit a330f8e1619b56baf7386968c99caa7bdb2591a9 Author: Mark Thomas AuthorDate: Thu Nov 19 11:12:27 2020 + Add release date for 10.0.0-M10 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 80a6e85..8d615bc 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,7 +119,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.107
On Wed, Nov 18, 2020 at 2:00 PM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.107 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.107/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1286/ > The git tag is: > https://github.com/apache/tomcat/tree/7.0.107 > b4237e4390895ad8880c7bf6a96ca2fdc2cd8507 > > The proposed 7.0.107 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.107 Stable > > Rémy
Re: [VOTE] Release Apache Tomcat 7.0.107
On Wed, Nov 18, 2020 at 3:00 PM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.107 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.107/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1286/ > The git tag is: > https://github.com/apache/tomcat/tree/7.0.107 > b4237e4390895ad8880c7bf6a96ca2fdc2cd8507 > > The proposed 7.0.107 release is: > [ ] Broken - do not release > [ X ] Stable - go ahead and release as 7.0.107 Stable > Tested with Apache Wicket 8.x examples application. Regards, Martin > > Regards, > Violeta >
