date:20200707

[GitHub] [tomcat] jbampton opened a new pull request #319: Fix bare URL

2020-07-07 Thread GitBox



jbampton opened a new pull request #319:
URL: https://github.com/apache/tomcat/pull/319


   
https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md#md034---bare-url-used



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

buildbot failure in on tomcat-9-trunk

2020-07-07 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/326

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 98a9f019fcf91c3173685c4a7203e8560df08e99
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64583] org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

--- Comment #5 from Mark Thomas  ---
OK. Done. Please re-test assuming you are able to.

-- 
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 7.0.x updated: Make tests more robust. Fix disabled tests.

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 112307f  Make tests more robust. Fix disabled tests.
112307f is described below

commit 112307ff5a0037e9c52e30fd8d1de94a7cb42096
Author: Mark Thomas 
AuthorDate: Tue Jul 7 20:52:40 2020 +0100

Make tests more robust. Fix disabled tests.
---
 .../websocket/pojo/TestEncodingDecoding.java   | 195 +++--
 1 file changed, 178 insertions(+), 17 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index f1fe195..484a8b4 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -22,10 +22,10 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.servlet.ServletContextEvent;
@@ -40,6 +40,7 @@ import javax.websocket.Endpoint;
 import javax.websocket.EndpointConfig;
 import javax.websocket.Extension;
 import javax.websocket.MessageHandler;
+import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
@@ -61,9 +62,15 @@ import org.apache.tomcat.websocket.server.WsContextListener;
 public class TestEncodingDecoding extends TomcatBaseTest {
 
 private static final String MESSAGE_ONE = "message-one";
+private static final String MESSAGE_TWO = "message-two";
 private static final String PATH_PROGRAMMATIC_EP = "/echoProgrammaticEP";
 private static final String PATH_ANNOTATED_EP = "/echoAnnotatedEP";
 private static final String PATH_GENERICS_EP = "/echoGenericsEP";
+private static final String PATH_MESSAGES_EP = "/echoMessagesEP";
+private static final String PATH_BATCHED_EP = "/echoBatchedEP";
+
+private static final int WAIT_LOOPS = 50;
+private static final int WAIT_DELAY = 100;
 
 
 @Test
@@ -89,13 +96,13 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.getBasicRemote().sendObject(msg1);
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (MsgStringMessageHandler.received.size() > 0 &&
 client.received.size() > 0) {
 break;
 }
-Thread.sleep(100);
 i++;
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -140,11 +147,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
-Thread.sleep(100);
+i++;
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -200,11 +208,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
-Thread.sleep(100);
+i++;
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -218,14 +227,108 @@ public class TestEncodingDecoding extends TomcatBaseTest 
{
 }
 
 
+@Test
+public void testMessagesEndPoints() throws Exception {
+// Set up utility classes
+MessagesServer server = new MessagesServer();
+SingletonConfigurator.setInstance(server);
+ServerConfigListener.setPojoClazz(MessagesServer.class);
+
+Tomcat tomcat = getTomcatInstance();
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
+ctx.addApplicationListener(ServerConfigListener.class.getName());
+Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ctx.addServletMapping("/", "default");
+
+WebSocketContainer wsContainer =
+ContainerProvider.getWebSocketContainer();
+
+tomcat.start();
+
+StringClient client = new StringClient();
+URI uri = new URI("ws://localhost:" + getPort() + PATH_MESSAGES_EP);
+Session session = wsContainer.connectToServer(client, uri);
+
+session.getBasicRemote().sendText(MESSAGE_ONE);
+
+// Should not take very long
+int i = 0;
+

[tomcat] branch 8.5.x updated: Make tests more robust. Fix disabled tests.

2020-07-07 Thread markt

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 0101789  Make tests more robust. Fix disabled tests.
0101789 is described below

commit 0101789eb38f1b43200ff3128746b4c9227dc1c3
Author: Mark Thomas 
AuthorDate: Tue Jul 7 20:52:40 2020 +0100

Make tests more robust. Fix disabled tests.
---
 .../websocket/pojo/TestEncodingDecoding.java   | 57 +++---
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index bf2d36d..91b9034 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -49,7 +49,6 @@ import javax.websocket.server.ServerEndpoint;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -70,6 +69,9 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 private static final String PATH_MESSAGES_EP = "/echoMessagesEP";
 private static final String PATH_BATCHED_EP = "/echoBatchedEP";
 
+private static final int WAIT_LOOPS = 50;
+private static final int WAIT_DELAY = 100;
+
 
 @Test
 public void testProgrammaticEndPoints() throws Exception{
@@ -93,13 +95,13 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.getBasicRemote().sendObject(msg1);
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (MsgStringMessageHandler.received.size() > 0 &&
 client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -144,12 +146,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -205,12 +207,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -223,8 +225,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.close();
 }
 
+
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testMessagesEndPoints() throws Exception {
 // Set up utility classes
 MessagesServer server = new MessagesServer();
@@ -251,17 +253,17 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
 Assert.assertEquals(1, server.received.size());
-Assert.assertEquals(1, client.received.size());
+Assert.assertEquals(2, client.received.size());
 
 // Check correct messages were received
 Assert.assertEquals(MESSAGE_ONE, server.received.peek());
@@ -272,7 +274,6 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testBatchedEndPoints() throws Exception {
 // Set up utility classes
 BatchedServer server = new BatchedServer();
@@ -299,12 +300,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i++ < 20) {
-if (server.received.size() > 0 && client.received.size() > 0) {
+while (i++ < WAIT_LOOPS) {
+if (server.received.size() > 0 && client.received.size() > 1) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -321,12 +322,12 @@ public class

[tomcat] branch 9.0.x updated: Make tests more robust. Fix disabled tests.

2020-07-07 Thread markt

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 98a9f01  Make tests more robust. Fix disabled tests.
98a9f01 is described below

commit 98a9f019fcf91c3173685c4a7203e8560df08e99
Author: Mark Thomas 
AuthorDate: Tue Jul 7 20:52:40 2020 +0100

Make tests more robust. Fix disabled tests.
---
 .../websocket/pojo/TestEncodingDecoding.java   | 57 +++---
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index bf2d36d..91b9034 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -49,7 +49,6 @@ import javax.websocket.server.ServerEndpoint;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -70,6 +69,9 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 private static final String PATH_MESSAGES_EP = "/echoMessagesEP";
 private static final String PATH_BATCHED_EP = "/echoBatchedEP";
 
+private static final int WAIT_LOOPS = 50;
+private static final int WAIT_DELAY = 100;
+
 
 @Test
 public void testProgrammaticEndPoints() throws Exception{
@@ -93,13 +95,13 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.getBasicRemote().sendObject(msg1);
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (MsgStringMessageHandler.received.size() > 0 &&
 client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -144,12 +146,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -205,12 +207,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -223,8 +225,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.close();
 }
 
+
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testMessagesEndPoints() throws Exception {
 // Set up utility classes
 MessagesServer server = new MessagesServer();
@@ -251,17 +253,17 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
 Assert.assertEquals(1, server.received.size());
-Assert.assertEquals(1, client.received.size());
+Assert.assertEquals(2, client.received.size());
 
 // Check correct messages were received
 Assert.assertEquals(MESSAGE_ONE, server.received.peek());
@@ -272,7 +274,6 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testBatchedEndPoints() throws Exception {
 // Set up utility classes
 BatchedServer server = new BatchedServer();
@@ -299,12 +300,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i++ < 20) {
-if (server.received.size() > 0 && client.received.size() > 0) {
+while (i++ < WAIT_LOOPS) {
+if (server.received.size() > 0 && client.received.size() > 1) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -321,12 +322,12 @@ public class

[tomcat] branch master updated: Make tests more robust. Fix disabled tests.

2020-07-07 Thread markt

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 45c03ee  Make tests more robust. Fix disabled tests.
45c03ee is described below

commit 45c03ee391d39da3da123dccee7dfff85d413a3f
Author: Mark Thomas 
AuthorDate: Tue Jul 7 20:52:40 2020 +0100

Make tests more robust. Fix disabled tests.
---
 .../websocket/pojo/TestEncodingDecoding.java   | 57 +++---
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java 
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index ea7374d..ab1d7b1 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -49,7 +49,6 @@ import jakarta.websocket.server.ServerEndpoint;
 import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -70,6 +69,9 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 private static final String PATH_MESSAGES_EP = "/echoMessagesEP";
 private static final String PATH_BATCHED_EP = "/echoBatchedEP";
 
+private static final int WAIT_LOOPS = 50;
+private static final int WAIT_DELAY = 100;
+
 
 @Test
 public void testProgrammaticEndPoints() throws Exception{
@@ -93,13 +95,13 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.getBasicRemote().sendObject(msg1);
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (MsgStringMessageHandler.received.size() > 0 &&
 client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -144,12 +146,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -205,12 +207,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -223,8 +225,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 session.close();
 }
 
+
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testMessagesEndPoints() throws Exception {
 // Set up utility classes
 MessagesServer server = new MessagesServer();
@@ -251,17 +253,17 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i < 20) {
+while (i < WAIT_LOOPS) {
 if (server.received.size() > 0 && client.received.size() > 0) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
 Assert.assertEquals(1, server.received.size());
-Assert.assertEquals(1, client.received.size());
+Assert.assertEquals(2, client.received.size());
 
 // Check correct messages were received
 Assert.assertEquals(MESSAGE_ONE, server.received.peek());
@@ -272,7 +274,6 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 
 @Test
-@Ignore // TODO Investigate why this test fails
 public void testBatchedEndPoints() throws Exception {
 // Set up utility classes
 BatchedServer server = new BatchedServer();
@@ -299,12 +300,12 @@ public class TestEncodingDecoding extends TomcatBaseTest {
 
 // Should not take very long
 int i = 0;
-while (i++ < 20) {
-if (server.received.size() > 0 && client.received.size() > 0) {
+while (i++ < WAIT_LOOPS) {
+if (server.received.size() > 0 && client.received.size() > 1) {
 break;
 }
 i++;
-Thread.sleep(100);
+Thread.sleep(WAIT_DELAY);
 }
 
 // Check messages were received
@@ -321,12 +322,12 @@ public class

[Bug 64583] org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #4 from Mark Thomas  ---
I see some potential concurrency issues in that test class but I am having
trouble reproducing the issue. I've only managed once out of ~50 runs so far.
If I address the issues I see, can you re-test?

-- 
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

[GitHub] [tomcat] sephiroth-j commented on pull request #311: support schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri()

2020-07-07 Thread GitBox



sephiroth-j commented on pull request #311:
URL: https://github.com/apache/tomcat/pull/311#issuecomment-654992932


   you are welcome



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

buildbot failure in on tomcat-7-trunk

2020-07-07 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1733

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 223f1bbfe62e8874233d5164211d8faf2c39d2c3
Blamelist: sephiroth-j 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Improving SameSite support

2020-07-07 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Rémy,

On 7/7/20 03:10, Rémy Maucherat wrote:
> On Mon, Jul 6, 2020 at 9:27 PM Christopher Schultz
>  >
wrote:
>
> All,
>
> Jakarta EE 5.0 does not appear to include support for SameSite
> cookies. Tomcat's CookieProcessor allows an administrator to set
> the SameSite cookie policy, but it's a blanket policy.
>
> So for example, if you want a JSESSIONID cookie to be "strict" but
> some other cookie (e.g. "FOO") to be "unset" or "lax" or whatever,
> you will have to manually-build your "Set-Cookie" headers for your
> FOO cooki e.
>
> This is not terribly convenient.
>
> Unfortunately, *any* solution to this problem will be
> container-specific. The current Tomcat solution is of course a
> solution only for Tomcat, and only for versions which contain that
> SameSite support.
>
> I'm wondering if we can do better.
>
> Instead of a single "sameSiteCookies" setting which applies to
> *all* cookies, perhaps the CookieProcessor could have a different
> policy for specific cookies. Something like this:
>
>  className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
> sameSiteCookies="unset">  policy="strict" />  /> ... 
>
> In the above setup, the "sameSiteCookie" attribute of the
> CookieProcessor sets the default policy for the CookieProcessor.
> Then, each of the  elements sets the policy for a
> specific cookie by name.
>
> This would allow applications to set their policies without having
> to construct their own Set-Cookie response headers, handle
> encoding, etc. and it would also inherit any other Tomcat-supplied
> cookie-related policies.
>
> Another option would be to provide a subclass of j.s.h.Cookie
> which includes a setSameSite(String) method. The CookieProcessor
> could check for instanceof EnhancedCookie (or whatever) and use
> that setting for each Cookie object. But that seems like less of a
> good idea -- except that it would be easier for refactoring tools
> to locate instances of the Tomcat-specific Cookie class and replace
> them with a future SameSite-supporting official Jakarta EE Cookie
> class.
>
> WDYT?
>
>
>> This is a big configuration and API change. Adding a new element
>> is significant, so maybe an expanded syntax could be added to the
>> attribute instead (ex: "unset,JSESSIONID=strict,FOO=lax"; or
>> maybe a more compact "unset;strict=JSESSIONID,FOO;lax=BAR"). It's
>> still a breaking change though.

I think it's *either* an API change *or* a configuration change, not
both, and it can be done in a backward compatible way.

Using a single "complex" configuration value makes it difficult or
impossible to write an XML schema for validation. Not critical, but
it's a consideration IMHO.

Nobody HAS to use e.g. a new Cookie class and/or new configuration. My
proposed configuration remains backward-compatible because the
sameSiteCookies attribute sets the default policy and it's only
overridden if you supply some cookie-specific configuration.

I don't think adding a new XML element as a child of SameSiteCookies
is a huge deal: it just requires a bit of Digester configuration and a
method to append custom configuration to SameSiteCookies. A quick
change to *CookieProcessor.generate() to check for custom settings
would be easy, tool. (I'd suggest that the code be refactored so that
the SameSiteCookies class returns the proper SameSite cookie attribute
(or null/blank) so that each CookieProperssor doesn't have to repeat
the logic.)

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl8EhfEACgkQHPApP6U8
pFhXkxAAje++q65o9aq3L61hG+2y3B8yY+kFdiE+PwyvsVqbikHCSWNCVC3s8bpn
W56cYtajSGCItQvdrZfi76TowY2tnZHbzcJcquk6WMph/24nVMCekJ66ypQ3T1Hq
v6sn4sN8PZh8n3KoomeW2vy3oknbh0wX4IoTID333t02X15qdZbkngMmwouodH7d
aKF0yI2zBasz4J3XmCKWp/w7kfptp7Lf4TmxBcyEFJ1YKgQGMQCvQWUq6nBG9s6x
lt3fJJxNj44TtLQhu1k7LV/yesVO5V7IDQmvM7QfHo2Ny1M6eeMIMK2Yfelwa0uR
3yA5AmcVAVxh2d2PXKDJs1iy6u5hXZJtdXcPwE5qoTA9i4Au8SMDwJZPTmFlwPYc
NBsJWW4ahXFgcg+TyEZ1qSdk0HOsIrj21gLcsKZ6JMeu0mW2XZ1ekDS49+cBiXon
IUP7gfvMpGrp1eNbu6qVS6V8Odg1f11+iEC4w7gEhRER3KluHA9ujhMTR3lzR9ns
FcSmt16S6MNr1PK/5is2pNp4vFeGFVFUxvXxEt4SJGshF+WPrxDnWkCSs/hlRXR9
4bhUbXaBQuf827B4rONNepUf+fXoUQHkRmLcXFSF5Gx6rdtl1xm+OP9cPm+D0k6x
VAh5pLoXRtFv4NTMFyftBUVk0Kcm7EAsCwKbhDTEh8vsCKGFRTo=
=0n3F
-END PGP SIGNATURE-

-
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: Standardize XSL files. Fix spelling.

2020-07-07 Thread markt

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 8d32505  Standardize XSL files.  Fix spelling.
8d32505 is described below

commit 8d3250598225c9b6e2bae12d4a6d5b82ac9809bf
Author: John Bampton 
AuthorDate: Sun Jul 5 01:12:22 2020 +1000

Standardize XSL files.  Fix spelling.

Indents, lowercase HTML tags, blank lines
---
 modules/jdbc-pool/doc/package.xsl |  81 +++-
 webapps/docs/changelog.xml|   4 +
 webapps/docs/tomcat-docs.xsl  | 153 ++
 webapps/manager/xform.xsl | 133 ++---
 4 files changed, 194 insertions(+), 177 deletions(-)

diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index 07f738a..d3fd7ea 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -25,13 +25,11 @@
 http://www.w3.org/1999/XSL/Transform;
   version="1.0">
 
-
   
   
 
-
   
   
   
@@ -54,24 +52,20 @@
 
   
   
-  
+  
 
-
- - 
-
-
-
+  
+ - 
+  
+  
 
-  .
-  
-
+.
+
+  
 
-
   
 
-
   
   
 
@@ -79,19 +73,26 @@
 
 
   
-  
+  
+
   
-  
-  
-  
+
+  
+
+  
+
+  
   
-  
-
-  
+  
+
+  
+
+  
+
+  
 
   
 
-
   
   
 
@@ -99,19 +100,26 @@
 
 
   
-  
+  
+
   
-  
-  
-  
+
+  
+
+  
+
+  
   
-  
-
-  
+  
+
+  
+
+  
+
+  
 
   
 
-
   
   
 
@@ -134,9 +142,11 @@
   
 
   
-  
-
-  
+  
+
+  
+
+  
   
 
   
@@ -156,7 +166,6 @@
 
   
 
-
   
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61039de..a2ff2ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,10 @@
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   
+  
+Clean-up / standardize the XSL files used to generate the 
documentation.
+PR provided by John Bampton. (markt)
+  
 
   
 
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 9f7551d..a940896 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -20,7 +20,6 @@
 http://www.w3.org/1999/XSL/Transform;
   version="3.0">
 
-
   
   
 
-
   
   
   https://tomcat.apache.org/'"/>
@@ -55,13 +53,13 @@
   
   project.xml
   
+select="document($project-xml-filename)/project"/>
 
   
   
 
 
-  
 
   
-  
+
 
-  
+
   
   
-  
-
+  
+
   
-
+
+  
+
+  
+
+
+  
+
+  
+
+  
   
-
+
   
-  
-
+  
+https://www.apache.org/; target="_blank">
   
-
-
-
-
-  
-
-
-  https://www.apache.org/; target="_blank">
-
-
-
-  Version ,
-  
+  
+  
+Version ,
+
+  
+  
+  
 
-
-
   
 
-  
+  
 
   
 
@@ -144,28 +144,26 @@
   
 
   
-  
+  
+
 Copyright © 1999-, The Apache Software 
Foundation
-  
-
+
+  
+  
 
 
-
-
   
 
-
   
   
-  
-
-
-  
-
-  
+
+  
+  
+
+  
+
   
 
-
   
   
 
@@ -174,7 +172,6 @@
 
   
 
-
   
   
 
@@ -191,7 +188,6 @@
   
 
 
-
 
 
   
@@ -206,10 +202,8 @@
 
   
 
-
   
 
-
   
   
 
@@ -219,8 +213,7 @@
 
 
   
+  count(//*[self::section or 
self::subsection][@name=current()/@name])  1">
 
   
   
@@ -243,10 +236,8 @@
 
   
 
-
   
 
-
   
   
 
@@ -260,8 +251,7 @@
 
 
   
+  count(//*[self::section or 
self::subsection][@name=current()/@name])  1">
 
   
   
@@ -278,17 +268,16 @@
 
   
 
-
   
   
-  
-
-  
-wrap
-  
-  
-
-  
+
+  
+
+  wrap
+
+
+  
+
   
 
   
@@ -354,73 +343,73 @@
   
 /images/add.gif
 
-
-  
+  
+

[tomcat] branch 8.5.x updated: Standardize XSL files. Fix spelling.

2020-07-07 Thread markt

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 5e0374d  Standardize XSL files.  Fix spelling.
5e0374d is described below

commit 5e0374d6380844d85f22f2f2726d6f873cdf89ff
Author: John Bampton 
AuthorDate: Sun Jul 5 01:12:22 2020 +1000

Standardize XSL files.  Fix spelling.

Indents, lowercase HTML tags, blank lines
---
 modules/jdbc-pool/doc/package.xsl |  81 +++-
 webapps/docs/changelog.xml|   4 +
 webapps/docs/tomcat-docs.xsl  | 153 ++
 webapps/manager/xform.xsl | 133 ++---
 4 files changed, 194 insertions(+), 177 deletions(-)

diff --git a/modules/jdbc-pool/doc/package.xsl 
b/modules/jdbc-pool/doc/package.xsl
index 07f738a..d3fd7ea 100644
--- a/modules/jdbc-pool/doc/package.xsl
+++ b/modules/jdbc-pool/doc/package.xsl
@@ -25,13 +25,11 @@
 http://www.w3.org/1999/XSL/Transform;
   version="1.0">
 
-
   
   
 
-
   
   
   
@@ -54,24 +52,20 @@
 
   
   
-  
+  
 
-
- - 
-
-
-
+  
+ - 
+  
+  
 
-  .
-  
-
+.
+
+  
 
-
   
 
-
   
   
 
@@ -79,19 +73,26 @@
 
 
   
-  
+  
+
   
-  
-  
-  
+
+  
+
+  
+
+  
   
-  
-
-  
+  
+
+  
+
+  
+
+  
 
   
 
-
   
   
 
@@ -99,19 +100,26 @@
 
 
   
-  
+  
+
   
-  
-  
-  
+
+  
+
+  
+
+  
   
-  
-
-  
+  
+
+  
+
+  
+
+  
 
   
 
-
   
   
 
@@ -134,9 +142,11 @@
   
 
   
-  
-
-  
+  
+
+  
+
+  
   
 
   
@@ -156,7 +166,6 @@
 
   
 
-
   
   
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 333fbc7..b40ba26 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -62,6 +62,10 @@
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   
+  
+Clean-up / standardize the XSL files used to generate the 
documentation.
+PR provided by John Bampton. (markt)
+  
 
   
 
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 9c7a01b..a9aa7b4 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -20,7 +20,6 @@
 http://www.w3.org/1999/XSL/Transform;
   version="3.0">
 
-
   
   
 
-
   
   
   https://tomcat.apache.org/'"/>
@@ -55,13 +53,13 @@
   
   project.xml
   
+select="document($project-xml-filename)/project"/>
 
   
   
 
 
-  
 
   
-  
+
 
-  
+
   
   
-  
-
+  
+
   
-
+
+  
+
+  
+
+
+  
+
+  
+
+  
   
-
+
   
-  
-
+  
+https://www.apache.org/; target="_blank">
   
-
-
-
-
-  
-
-
-  https://www.apache.org/; target="_blank">
-
-
-
-  Version ,
-  
+  
+  
+Version ,
+
+  
+  
+  
 
-
-
   
 
-  
+  
 
   
 
@@ -144,28 +144,26 @@
   
 
   
-  
+  
+
 Copyright © 1999-, The Apache Software 
Foundation
-  
-
+
+  
+  
 
 
-
-
   
 
-
   
   
-  
-
-
-  
-
-  
+
+  
+  
+
+  
+
   
 
-
   
   
 
@@ -174,7 +172,6 @@
 
   
 
-
   
   
 
@@ -191,7 +188,6 @@
   
 
 
-
 
 
   
@@ -206,10 +202,8 @@
 
   
 
-
   
 
-
   
   
 
@@ -219,8 +213,7 @@
 
 
   
+  count(//*[self::section or 
self::subsection][@name=current()/@name])  1">
 
   
   
@@ -243,10 +236,8 @@
 
   
 
-
   
 
-
   
   
 
@@ -260,8 +251,7 @@
 
 
   
+  count(//*[self::section or 
self::subsection][@name=current()/@name])  1">
 
   
   
@@ -278,17 +268,16 @@
 
   
 
-
   
   
-  
-
-  
-wrap
-  
-  
-
-  
+
+  
+
+  wrap
+
+
+  
+
   
 
   
@@ -354,73 +343,73 @@
   
 /images/add.gif
 
-
-  
+  
+

[tomcat] branch master updated (3545d92 -> 292a6a0)

2020-07-07 Thread markt

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 3545d92  Update changelog
 add 292a6a0  Standardize XSL files.  Fix spelling.

No new revisions were added by this update.

Summary of changes:
 modules/jdbc-pool/doc/package.xsl |  81 +++-
 webapps/docs/changelog.xml|   4 +
 webapps/docs/tomcat-docs.xsl  | 153 ++
 webapps/manager/xform.xsl | 133 ++---
 4 files changed, 194 insertions(+), 177 deletions(-)


-
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 #315: Standardize XSL files. Fix spelling.

2020-07-07 Thread GitBox



markt-asf commented on pull request #315:
URL: https://github.com/apache/tomcat/pull/315#issuecomment-654896870


   Thanks for the PR. Applied to 10.0.x. Back-porting shortly.



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 #315: Standardize XSL files. Fix spelling.

2020-07-07 Thread GitBox



markt-asf closed pull request #315:
URL: https://github.com/apache/tomcat/pull/315


   



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

Re: Catalina internals available from HttpServletRequest?

2020-07-07 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 7/6/20 16:45, Mark Thomas wrote:
> On 06/07/2020 21:23, Christopher Schultz wrote:
>> All,
>>
>> I'm looking at modifying the existing LoadBalancerDrainingValve
>> to also function as a Filter if necessary (my application uses a
>> Filter to establish authentication information, so I'd like the
>> "valve" to act *after* the filter if possible) and it looks like
>> I need access to some Tomcat internals.
>>
>> Specifically, I'd like to be able to get to the
>> org.apache.catalina.Context object for the request. Is this
>> available without reflection and/or other ugly things?
>>
>> Hmm. It looks like a Valve *cannot* be a Filter because of the
>> presence of the incompatible destroy() method.
>>
>> I still want to provide a Filter if possible, so the above
>> question still stands.
>>
>> If the Context isn't available, could it be added to the
>> ServletContext attributes, possibly under a non-reported hash
>> key?
>
> That would create security issues.
>
> A Filter equivalent to ContainerServlet could work - although that
> is a fairly invasive change for something that could be fixed more
> easily.
>
> How about a Valve that injects the necessary internal object(s) as
> request attributes? Alternatively, you could inject some custom
> object that held the references internally and just exposed the
> functionality you wanted to expose.

The calls I'm having trouble with are similar to this one:

if (drain) {
boolean ignoreRebalance = false;
Cookie sessionCookie = null;

final Cookie[] cookies = request.getCookies();

final String sessionCookieName =
SessionConfig.getSessionCookieName(request.getContext());


That last call to request.getContext is calling
o.a.c.connector.Request.getContext to hand to
SessionConfig.getSessionCookieName.

This valve also does something similar for
SessionConfig.getSessionCookiePath and
SessionConfig.getSessionUriParamName.

I could read those values from elsewhere (e.g. during startup?), or
even make them init-param of the Filter and avoid the whole thing, but
that does require some additional configuration. The valve is nice and
magical :)

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl8EgfoACgkQHPApP6U8
pFhQaw/9GS6/JH7IGNMhbuRMHwdYBlCLam9cBZuEz1tiJW4F+hk7kr7/phGJu+Sy
DAHPGMIlUpcSaH0KoPnE2OWzM0xqBJydIuoI+pydc1/MEPNVDD/uUbvHyIacRWoa
ucgYbwDDq8n23cujJYstvm4MJBcFOhxgnyaG+XFSUuDUZARCw6hXSJx7kxr+V07z
4K0P0wcYUisPzN3bFQhzRanJ494izfYz0w7AybnmWYPLmBEX5PObt3aYCW6ZaTXs
ajQjyg441pSFkjk1F6MeYJSbAFW+aomU9zrgTgHEcZJ1OkZG6EwS0dD2tbDi7vVU
Ns1jjxDD0ZPgHI9rkiFzhI1gb38/HmbgeU2AIF64r3DIol9/d2R/6bYS5yh6jMXl
1ne5XIXlNq8SLMvbcbCtHE4t5hfKgCQ54jsAY7tgHCRbixwJnftUQMYCfmImuIko
NAQ3BzZw3P04XGXPEDZ0NqKvplxV/yoAf/BtD1xE6bySPoXbrx2UMDEIHU5zeiP8
xH5JC9Dg0Qz6yAEKQd1Sk9BrxmY3Fr4spnVTcuU/fU7OSWF+1vf0wTZ1CT/JcQmB
aYvTQcGYjxi9GynZKDS6TM1kAenul5QF5sDLmLMGtXpzSXjMKK0IEKhpXlG2013F
ktDMhbaM4tXAmZr3lBjpYwYiWSFCZ7tJDflO2EAHbGXweU+ehkQ=
=eS0L
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 11.1](https://tools.ietf.o

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 223f1bb  support of schemes "wss" and "ws" in 
WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as 
outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"
223f1bb is described below

commit 223f1bbfe62e8874233d5164211d8faf2c39d2c3
Author: sephiroth-j 
AuthorDate: Thu Jul 2 20:41:53 2020 +0200

support of schemes "wss" and "ws" in
WsHandshakeRequest.buildRequestUri()
requests with scheme "wss" or "ws", as outlined in [RFC 6455 section
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an
`IllegalArgumentException` with message
"wsHandshakeRequest.unknownScheme"

this fixes a regression from e09e6b04e41d3dae27fcfe060e6f8f89f1c0d6b5 /
BZ 62731
---
 .../apache/tomcat/websocket/server/WsHandshakeRequest.java   |  4 
 webapps/docs/changelog.xml   | 12 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index 70c5078..8ba161f 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -156,6 +156,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append("ws");
 } else if ("https".equals(scheme)) {
 uri.append("wss");
+} else if ("wss".equals(scheme) || "ws".equals(scheme)) {
+uri.append(scheme);
 } else {
 // Should never happen
 throw new IllegalArgumentException(
@@ -166,6 +168,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append(req.getServerName());
 
 if ((scheme.equals("http") && (port != 80))
+|| (scheme.equals("ws") && (port != 80))
+|| (scheme.equals("wss") && (port != 443))
 || (scheme.equals("https") && (port != 443))) {
 uri.append(':');
 uri.append(port);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9e3e6a8..bcac7a0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,10 +60,20 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Requests received via proxies may be marked as using the 
ws
+or wss protocol rather than http or
+https. Ensure that such requests are not rejected. PR
+provided by Ronny Perinke. (markt)
+  
+
+  
   
 
   
-Remove the localization of the text output of the Manager application 
+Remove the localization of the text output of the Manager application
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   


-
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: support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 11.1](https://tools.ietf.o

2020-07-07 Thread markt

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 2315511  support of schemes "wss" and "ws" in 
WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as 
outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"
2315511 is described below

commit 231551164426c6578fc5b4bcffd84d4af0abf3dc
Author: sephiroth-j 
AuthorDate: Thu Jul 2 20:41:53 2020 +0200

support of schemes "wss" and "ws" in
WsHandshakeRequest.buildRequestUri()
requests with scheme "wss" or "ws", as outlined in [RFC 6455 section
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an
`IllegalArgumentException` with message
"wsHandshakeRequest.unknownScheme"

this fixes a regression from e09e6b04e41d3dae27fcfe060e6f8f89f1c0d6b5 /
BZ 62731
---
 .../apache/tomcat/websocket/server/WsHandshakeRequest.java   |  4 
 webapps/docs/changelog.xml   | 12 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index cb8bd2f..2bfc441 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -156,6 +156,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append("ws");
 } else if ("https".equals(scheme)) {
 uri.append("wss");
+} else if ("wss".equals(scheme) || "ws".equals(scheme)) {
+uri.append(scheme);
 } else {
 // Should never happen
 throw new IllegalArgumentException(
@@ -166,6 +168,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append(req.getServerName());
 
 if ((scheme.equals("http") && (port != 80))
+|| (scheme.equals("ws") && (port != 80))
+|| (scheme.equals("wss") && (port != 443))
 || (scheme.equals("https") && (port != 443))) {
 uri.append(':');
 uri.append(port);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb32064..333fbc7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,10 +45,20 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Requests received via proxies may be marked as using the 
ws
+or wss protocol rather than http or
+https. Ensure that such requests are not rejected. PR
+provided by Ronny Perinke. (markt)
+  
+
+  
   
 
   
-Remove the localization of the text output of the Manager application 
+Remove the localization of the text output of the Manager application
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   


-
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 #311: support schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri()

2020-07-07 Thread GitBox



markt-asf commented on pull request #311:
URL: https://github.com/apache/tomcat/pull/311#issuecomment-654878703


   Thanks for the PR



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 9.0.x updated: support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 11.1](https://tools.ietf.o

2020-07-07 Thread markt

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 7fe71d1  support of schemes "wss" and "ws" in 
WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as 
outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"
7fe71d1 is described below

commit 7fe71d1df99bc1567bb1549dc505c87f0e46f77a
Author: sephiroth-j 
AuthorDate: Thu Jul 2 20:41:53 2020 +0200

support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri()
requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"

this fixes a regression from e09e6b04e41d3dae27fcfe060e6f8f89f1c0d6b5 / BZ 
62731
---
 .../apache/tomcat/websocket/server/WsHandshakeRequest.java   |  4 
 webapps/docs/changelog.xml   | 12 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index cb8bd2f..2bfc441 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -156,6 +156,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append("ws");
 } else if ("https".equals(scheme)) {
 uri.append("wss");
+} else if ("wss".equals(scheme) || "ws".equals(scheme)) {
+uri.append(scheme);
 } else {
 // Should never happen
 throw new IllegalArgumentException(
@@ -166,6 +168,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append(req.getServerName());
 
 if ((scheme.equals("http") && (port != 80))
+|| (scheme.equals("ws") && (port != 80))
+|| (scheme.equals("wss") && (port != 443))
 || (scheme.equals("https") && (port != 443))) {
 uri.append(':');
 uri.append(port);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8f4fefe..61039de 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,10 +45,20 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Requests received via proxies may be marked as using the 
ws
+or wss protocol rather than http or
+https. Ensure that such requests are not rejected. PR
+provided by Ronny Perinke. (markt)
+  
+
+  
   
 
   
-Remove the localization of the text output of the Manager application 
+Remove the localization of the text output of the Manager application
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Update changelog

2020-07-07 Thread markt

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 3545d92  Update changelog
3545d92 is described below

commit 3545d92c398c7a526576b241ea810d5ab3cbf584
Author: Mark Thomas 
AuthorDate: Tue Jul 7 14:51:36 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cd84d7c..127f98f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,10 +45,20 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Requests received via proxies may be marked as using the 
ws
+or wss protocol rather than http or
+https. Ensure that such requests are not rejected. PR
+provided by Ronny Perinke. (markt)
+  
+
+  
   
 
   
-Remove the localization of the text output of the Manager application 
+Remove the localization of the text output of the Manager application
 list of contexts and the Host Manager application list of hosts so that
 the output is more consistent. PR provided by Holomark. (markt)
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 11.1](https://tools.ietf.

2020-07-07 Thread markt

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 da4f6bb  support of schemes "wss" and "ws" in 
WsHandshakeRequest.buildRequestUri() requests with scheme "wss" or "ws", as 
outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"
da4f6bb is described below

commit da4f6bb1e570f8781b5cb27b2bce31f67316cbf6
Author: sephiroth-j 
AuthorDate: Thu Jul 2 20:41:53 2020 +0200

support of schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri()
requests with scheme "wss" or "ws", as outlined in [RFC 6455 section 
11.1](https://tools.ietf.org/html/rfc6455#section-11.1), will cause an 
`IllegalArgumentException` with message "wsHandshakeRequest.unknownScheme"

this fixes a regression from e09e6b04e41d3dae27fcfe060e6f8f89f1c0d6b5 / BZ 
62731
---
 java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java | 4 
 1 file changed, 4 insertions(+)

diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java 
b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index 712a2e9..3fb0b11 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -156,6 +156,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append("ws");
 } else if ("https".equals(scheme)) {
 uri.append("wss");
+} else if ("wss".equals(scheme) || "ws".equals(scheme)) {
+uri.append(scheme);
 } else {
 // Should never happen
 throw new IllegalArgumentException(
@@ -166,6 +168,8 @@ public class WsHandshakeRequest implements HandshakeRequest 
{
 uri.append(req.getServerName());
 
 if ((scheme.equals("http") && (port != 80))
+|| (scheme.equals("ws") && (port != 80))
+|| (scheme.equals("wss") && (port != 443))
 || (scheme.equals("https") && (port != 443))) {
 uri.append(':');
 uri.append(port);


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf merged pull request #311: support schemes "wss" and "ws" in WsHandshakeRequest.buildRequestUri()

2020-07-07 Thread GitBox



markt-asf merged pull request #311:
URL: https://github.com/apache/tomcat/pull/311


   



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

Re: [VOTE] Release Apache Tomcat 7.0.105

2020-07-07 Thread Konstantin Kolinko

чт, 2 июл. 2020 г. в 16:08, Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.105 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.105/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1275/
> The git tag is:
> https://github.com/apache/tomcat/tree/7.0.105
> f95f4e146e7eb463abdd8d7e2c47095d50075d97
>
> The proposed 7.0.105 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 7.0.105 Stable

Unit tests are OK, tested with Java 6u45 (32-bit) (with several known
failures on this platform), 7u80 (32-bit), AdoptOpenJDK Java 8.0.252
(64-bit), 11.0.7 (64-bit) on Windows 10,
with an exception of one flaky test that fails occasionally. I filed
the details into Bugzilla:

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583
org.apache.tomcat.websocket.pojo.TestEncodingDecoding /
testAnnotatedEndPoints - testEvent fails occasionally

It is not a showstopper.

Smoke tests are OK.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64583] org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

--- Comment #3 from Konstantin Kolinko  ---
Searching other mentions of the test class in Bugzilla,
it looks that those checks in the test were added when fixing bug 55127.

-- 
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

buildbot success in on tomcat-7-trunk

2020-07-07 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1732

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] a98552c1c665fde492d86d546d5a301544901579
Blamelist: Mark Thomas ,Violeta Georgieva [VMware] 


Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64583] org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

--- Comment #2 from Konstantin Kolinko  ---
Created attachment 37353
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37353=edit
TEST-org.apache.tomcat.websocket.pojo.TestEncodingDecoding.NIO.txt

A log from testing with Java 11 (AdoptOpenJDK jdk-11.0.7.10-hotspot)

-- 
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

[Bug 64583] org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

--- Comment #1 from Konstantin Kolinko  ---
Created attachment 37352
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37352=edit
TEST-org.apache.tomcat.websocket.pojo.TestEncodingDecoding.APR.txt

A log from testing with Java 8 (AdoptOpenJDK jdk-8.0.252.09-hotspot)

-- 
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

[Bug 64583] New: org.apache.tomcat.websocket.pojo.TestEncodingDecoding / testAnnotatedEndPoints - testEvent fails occasionally

2020-07-07 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64583

Bug ID: 64583
   Summary: org.apache.tomcat.websocket.pojo.TestEncodingDecoding
/ testAnnotatedEndPoints - testEvent fails
occasionally
   Product: Tomcat 7
   Version: trunk
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com
  Target Milestone: ---

Testing RC of Tomcat 7.0.105 I observe occasional failures with
org.apache.tomcat.websocket.pojo.TestEncodingDecoding test.

I do not consider this a showstopper.

The following test fails:

[[[
Testcase: testAnnotatedEndPoints took 5,185 sec
FAILED
null
junit.framework.AssertionFailedError
at
org.apache.tomcat.websocket.pojo.TestEncodingDecoding.testEvent(TestEncodingDecoding.java:230)
at
org.apache.tomcat.websocket.pojo.TestEncodingDecoding.testAnnotatedEndPoints(TestEncodingDecoding.java:164)
]]]

or

[[[
Testcase: testAnnotatedEndPoints took 5,181 sec
FAILED
null
junit.framework.AssertionFailedError
at
org.apache.tomcat.websocket.pojo.TestEncodingDecoding.testEvent(TestEncodingDecoding.java:230)
at
org.apache.tomcat.websocket.pojo.TestEncodingDecoding.testAnnotatedEndPoints(TestEncodingDecoding.java:162)
]]]

1. Note the line number difference:
TestEncodingDecoding.testAnnotatedEndPoints(TestEncodingDecoding.java:164)
TestEncodingDecoding.testAnnotatedEndPoints(TestEncodingDecoding.java:162)

"testEvent()" is a helper method, and the line number in testAnnotatedEndPoints
shows the actual event being tested:

[[[
161   // Should not take very long but some failures have been seen
162   i = testEvent(MsgStringEncoder.class.getName()+":init", 0);
163   i = testEvent(MsgStringDecoder.class.getName()+":init", i);
164   i = testEvent(MsgByteEncoder.class.getName()+":init", i);
165   i = testEvent(MsgByteDecoder.class.getName()+":init", i);
]]]

2. The failures are not reliable.

I observed the failures with AdoptOpenJDK 8u252 (jdk-8.0.252.09-hotspot) 64-bit
and AdoptOpenJDK 11.0.7 (jdk-11.0.7.10-hotspot) on Windows 10 1909.

Out of (1 + 1 + 10) * 3 connectors = 36 runs there are 6 failures, with
different connectors (BIO/NIO/APR). I guess that a connector does not matter.

3. The test could be improved to provide some better diagnostics, instead of
failing on the first error and with no message (null).

-- 
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 7.0.x updated: Update Tomcat 7.0.105 release date

2020-07-07 Thread violetagg

This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new a98552c  Update Tomcat 7.0.105 release date
a98552c is described below

commit a98552c1c665fde492d86d546d5a301544901579
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Jul 7 15:21:26 2020 +0300

Update Tomcat 7.0.105 release date
---
 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 a594f89..9e3e6a8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,7 +70,7 @@
 
   
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Add missing imports from previous backport

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new c089ff5  Add missing imports from previous backport
c089ff5 is described below

commit c089ff5004a7e7b9e2e43937f34f29136301b930
Author: Mark Thomas 
AuthorDate: Tue Jul 7 13:17:32 2020 +0100

Add missing imports from previous backport
---
 java/org/apache/catalina/manager/ManagerServlet.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/catalina/manager/ManagerServlet.java 
b/java/org/apache/catalina/manager/ManagerServlet.java
index 21eff06..d8a8d7e 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -22,7 +22,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Arrays;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Locale;
 
 import javax.management.MBeanServer;


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Nexus: Promotion Completed

2020-07-07 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Ant/Apache Ant(TM) version 1.9.15 compiled on May 10 2020 (Java 1.8.0_251; Windows 10 10.0) Aether""userId" = "violetagg""ip" = "78.83.99.114"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105.pom.asc(SHA1: 0b3435c8a321aeaa8df89e1d1863692149b7d7f9)/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105.jar(SHA1: 199f4e395fe27ae16ad515721148c97a6af766b1)/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105.jar.asc(SHA1: 1b9c0b56ee7e8ddb62318284931810083abd51d4)/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105-sources.jar(SHA1: 811716405fd8110540c9f86398979262978ed5ac)/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105.pom(SHA1: a0ca2c2412b4a73227ada40940dcc5a88c66fb89)/org/apache/tomcat/tomcat-catalina-ha/7.0.105/tomcat-catalina-ha-7.0.105-sources.jar.asc(SHA1: 48c4be5cc36bd06db00335c13374bc501386eebc)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105.pom.asc(SHA1: eb067a06e9aa6e1f43584c03feba56333b79b17b)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105-sources.jar(SHA1: 7d6d082284dcb4e42a615cc0ec250a85a945e5a5)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105.jar.asc(SHA1: c4b745f86bc4bf09fe8451cc0c976cf0d2cb9a5b)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105.jar(SHA1: 32676e99a36ed29b64fdc2cdc8f0ce1537ec4ed4)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105-sources.jar.asc(SHA1: b49b90e19456f3e9ea818bc76cb923e631302bab)/org/apache/tomcat/tomcat-api/7.0.105/tomcat-api-7.0.105.pom(SHA1: 0898132abf589dc6068f8b957fbfeee5880f7160)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105-sources.jar(SHA1: f187492f15f1b31a065fae7b21b93fcaf493d92d)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105.pom(SHA1: c563ea228c67105426ca15e6affc6f99b4ce0077)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105.jar.asc(SHA1: 57e7fff42e454c348d8667fe6e6fb231cbaee269)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105.jar(SHA1: 71e64f42b1d0ce04ab5ca9823472f7e6f9f2d00d)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105-sources.jar.asc(SHA1: f22b45d4df8735dcad3c2d5826f5146a86222cd2)/org/apache/tomcat/embed/tomcat-embed-logging-log4j/7.0.105/tomcat-embed-logging-log4j-7.0.105.pom.asc(SHA1: f5691d9b9f51c217a83eeb2f58eec332c3fc2c36)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105.jar(SHA1: 9568f8b30fbec0826d4edfb5705e54c81285d024)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105-sources.jar(SHA1: e9e1114cf0528f143c2b4902c836cde26047e731)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105.jar.asc(SHA1: 05cc5cbf61957559bd8c2b8fbcbc0f6a4c6d2bbb)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105.pom.asc(SHA1: 8c91011f94d91f6bdccb85726049e9615191c042)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105-sources.jar.asc(SHA1: fece9d26e0978015026c9183ed5e0b5b0c8b0cbb)/org/apache/tomcat/embed/tomcat-embed-jasper/7.0.105/tomcat-embed-jasper-7.0.105.pom(SHA1: 1b9cf1d0956b53b96e29764bfe199c3ea2573bda)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105.pom(SHA1: 9f7012b7ad9928d670b445a394c9d36395f54a12)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105-sources.jar(SHA1: 4c2154835081475602f11c235a3f3d27393700c8)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105-sources.jar.asc(SHA1: 86387a8d2a6ddcba00964b251a79a13ffe4bb097)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105.jar.asc(SHA1: 83e26e0b0af489a32aadedd870fc609009765ed4)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105.jar(SHA1: 5a04880fb45a0deca490a929f608850a90a83b49)/org/apache/tomcat/embed/tomcat-embed-core/7.0.105/tomcat-embed-core-7.0.105.pom.asc(SHA1: 231a0cbfe436d04146abddee4fcea223b01e8bc4)/org/apache/tomcat/embed/tomcat-embed-websocket/7.0.105/tomcat-embed-websocket-7.0.105.pom.asc(SHA1: d8d214efc962399aab8646d58bfa68b44fc25258)/org/apache/tomcat/embed/tomcat-embed-websocket/7.0.105/tomcat-embed-websocket-7.0.105.pom(SHA1: 9296a0d0ad8b9b7e26579903149dcbb0eb8574a5)/org/apache/tomcat/embed/tomcat-embed-websocket/7.0.105/tomcat-embed-websocket-7.0.105-sources.jar.asc(SHA1: 7bb1581a6368d6039402b46a775ad7e4c422d860)/org/apache/tomcat/embed/tomcat-embed-websocket/7.0.105/tomcat-embed-websocket-7.0.105.jar(SHA1: ed4b055db45efcb9b55609939995455a573fe91d)/org/apache/tomcat/embed/tomcat-embed-websocket/7.0.105/tomcat-embed-websocket-7.0.105.jar.asc(SHA1:

svn commit: r40336 - /dev/tomcat/tomcat-7/v7.0.105/ /release/tomcat/tomcat-7/v7.0.105/

2020-07-07 Thread violetagg

Author: violetagg
Date: Tue Jul  7 12:09:47 2020
New Revision: 40336

Log:
Release Tomcat 7.0.105

Added:
release/tomcat/tomcat-7/v7.0.105/
  - copied from r40335, dev/tomcat/tomcat-7/v7.0.105/
Removed:
dev/tomcat/tomcat-7/v7.0.105/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [RESULT][VOTE] Release Apache Tomcat 7.0.105

2020-07-07 Thread Violeta Georgieva

Hi,

На чт, 2.07.2020 г. в 16:08 Violeta Georgieva  написа:
>
> The proposed Apache Tomcat 7.0.105 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.105/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1275/
> The git tag is:
> https://github.com/apache/tomcat/tree/7.0.105
> f95f4e146e7eb463abdd8d7e2c47095d50075d97
>
> The proposed 7.0.105 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.105 Stable


+1 (binding):   violetagg, remm, fschumacher, csutherl

No other voters were cast.

The vote has passed.

I'll do the release shortly and announce it once the mirrors catch up.

Regards,
Violeta

buildbot failure in on tomcat-7-trunk

2020-07-07 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1731

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 259177cf110dbc052da5e33d4f58ad2d4d535c00
Blamelist: Fabien Zindy ,Mark Thomas 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




-
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.105

2020-07-07 Thread Coty Sutherland

On Thu, Jul 2, 2020 at 9:08 AM Violeta Georgieva 
wrote:

> The proposed Apache Tomcat 7.0.105 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.105/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1275/
> The git tag is:
> https://github.com/apache/tomcat/tree/7.0.105
> f95f4e146e7eb463abdd8d7e2c47095d50075d97
>
> The proposed 7.0.105 release is:
> [ ] Broken - do not release
> [x] Stable - go ahead and release as 7.0.105 Stable
>

+1


> Regards,
> Violeta
>

Re: Plans to get GenericPrincipal to inherit CallerPrincipal?

2020-07-07 Thread Jean-Louis MONTEIRO

Hello Mark,

Thanks for the quick response.
I was checking out if there were plans for it.

Glad it's on your radar.
I'm currently writing an Apache implementation on the TomEE side for the
Security API.

So definitely interested.
Would it help if I create a ticket to track the progress?


Le lun. 6 juil. 2020 à 14:50, Mark Thomas  a écrit :

> On 06/07/2020 12:43, Jean-Louis MONTEIRO wrote:
> > Hi,
> >
> > I would like to know if there are any plans to get GenericPrincipal to
> > inherit CallerPrincipal?
> > From a backward compatibility perspective, it does not seem to hurt
> > because the getName() is already in the GenericPrincipal.
> >
> > The question comes because I was reading the Java Security API and this
> > chapter
> >
> https://javaee.github.io/security-spec/spec/jsr375-spec.html#_caller_principal_types
> >
> > Seems to advise that app server should inherit from CallerPrincipal.
>
> JSR-375 was released after Java EE 8 - i.e. too late for Tomcat 9.
>
> Tomcat implements JASPIC, now Jakarta Authentication. We do need to look
> at what is changed in that spec for Jakarta EE 9 (Tomcat 10) - which
> should be very little.
>
> I don't think anyone has looked at looked at the Jakarta Security 2.0
> spec for Jakarta EE 9 (Tomcat 10). I agree having GenericPrincipal
> extend CallerPrincipal should be low impact. However, it would need to
> be looked at in the wider context of the entire spec. We can't just pick
> a single class. Taking a quick look the spec depends on CDI which Tomcat
> does not support. Adding a dependency to that JAR just to extend
> CallerPrincipal seems a little excessive at this point.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
Jean-Louis

[tomcat] 03/03: Update

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 259177cf110dbc052da5e33d4f58ad2d4d535c00
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f9564d1..a594f89 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Remove `hostManagerServlet.listitem` from the localized strings

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e36b6a790d91cc24eb786e8749fd92304e0e7f84
Author: Fabien Zindy 
AuthorDate: Thu Jul 2 00:34:36 2020 +0200

Remove `hostManagerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/host/HostManagerServlet.java | 11 ++-
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties   |  1 -
 8 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index faffbeb..4874ce2 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -44,6 +44,7 @@ import org.apache.catalina.core.ContainerBase;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.startup.HostConfig;
 import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -556,15 +557,7 @@ public class HostManagerServlet
 Host host = (Host) container;
 String name = host.getName();
 String[] aliases = host.findAliases();
-StringBuilder buf = new StringBuilder();
-if (aliases.length > 0) {
-buf.append(aliases[0]);
-for (int j = 1; j < aliases.length; j++) {
-buf.append(',').append(aliases[j]);
-}
-}
-writer.println(smClient.getString("hostManagerServlet.listitem",
-name, buf.toString()));
+writer.println(String.format("[%s]:[%s]", name, 
StringUtils.join(aliases)));
 }
 }
 
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties 
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 4ec01f3..e9dae5f 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception 
[{0}]
 hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
 hostManagerServlet.list=list: Listing hosts for engine [{0}]
 hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index e1d2c3c..c5b655d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción 
[{0}]
 hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre 
inválido de máquina [{0}]
 hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
 hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
 hostManagerServlet.noCommand=FALLO - No se ha especificado comando
 hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index 210e521..2e8cf8d 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
 hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été 
spécifié
 hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
 hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
 hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
 hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties

[tomcat] branch 7.0.x updated (60da928 -> 259177c)

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 60da928  maven-resolver-ant-tasks is used instead of maven-ant-tasks
 new 6943e29  Remove the `managerServlet.listitem` from the localized 
strings
 new e36b6a7  Remove `hostManagerServlet.listitem` from the localized 
strings
 new 259177c  Update

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 java/org/apache/catalina/manager/host/HostManagerServlet.java | 11 ++-
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties   |  1 -
 webapps/docs/changelog.xml|  9 +
 18 files changed, 18 insertions(+), 28 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/03: Remove the `managerServlet.listitem` from the localized strings

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6943e29e339dafa410e0ad1d6617ccb233844a91
Author: Fabien Zindy 
AuthorDate: Tue Jun 30 21:04:14 2020 +0200

Remove the `managerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 001fcaa..51bffb4 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -122,7 +122,6 @@ managerServlet.invalidCommand=FAIL - Invalid parameters 
supplied for command [{0
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
 managerServlet.invalidWar=FAIL - Invalid application URL [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
 managerServlet.noAppBase=FAIL - Cannot identify application base for context 
path [{0}]
 managerServlet.noCommand=FAIL - No command was specified
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties 
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index c93da49..40d7398 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
 managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
 managerServlet.invalidWar=FEHLER - Ungültige URL [{0}] für Anwendung angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server 
[{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt 
werden.
 managerServlet.noAppBase=FEHLER - Kann Verzeichnis für Kontext Pfad [{0}] 
nicht finden
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 389b530..7ff7931 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -87,7 +87,6 @@ managerServlet.invalidCommand=Fallo - Se proveiron parámetros 
inválidos para e
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida 
de contexto [{0}]
 managerServlet.invalidWar=FALLO - Se ha especificado una URL de aplicación 
inválida [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
 managerServlet.noAppBase=FALLO - No puedo identificar aplicación base para 
trayectoria de contexto [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 41c1277..1f2c996 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -120,7 +120,6 @@ managerServlet.invalidCommand=ECHEC - Des paramètres 
incorrects ont été fourn
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été 
spécifié
 managerServlet.invalidWar=ECHEC - Une URL d''application invalide [{0}] a été 
spécifiée
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual 
host) [{0}]
-managerServlet.listitem={0} : {1} : {2} : {3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
 managerServlet.noAppBase=ECHEC - Impossible d''identifier la base de 
l''application base pour le chemin de contexte [{0}]
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 2bcf0d7..48526f7 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++

[tomcat] branch 8.5.x updated (032e8a5 -> 3bd8d73)

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 032e8a5  Add release date for Apache Tomcat 8.5.57
 new 04564c6  Remove the `managerServlet.listitem` from the localized 
strings
 new d5dfd5b  Remove `hostManagerServlet.listitem` from the localized 
strings
 new 3bd8d73  Update

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 java/org/apache/catalina/manager/host/HostManagerServlet.java |  3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties   |  1 -
 webapps/docs/changelog.xml|  9 +
 18 files changed, 17 insertions(+), 21 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/03: Remove the `managerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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

commit 04564c61795130d83c47462ba7178b48d84c89ab
Author: Fabien Zindy 
AuthorDate: Tue Jun 30 21:04:14 2020 +0200

Remove the `managerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 91c3697..a1116c5 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -131,7 +131,6 @@ managerServlet.inService=FAIL - The application [{0}] is 
already being serviced
 managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command 
[{0}]
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
 managerServlet.noCommand=FAIL - No command was specified
 managerServlet.noContext=FAIL - No context exists named [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties 
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index 21eb39d..856d389 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.deployed=OK - Anwendung mit Kontext Pfad [{0}] 
installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
 managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server 
[{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt 
werden.
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
 managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 28c7e72..743e99c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -86,7 +86,6 @@ managerServlet.findleaksNone=OK - No se han hallado fallos de 
memoria
 managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para 
el comando [{0}]
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida 
de contexto [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
 managerServlet.noContext=FALLO - No existe contexto para trayectoria [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 4fbe336..d1a5e2e 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -129,7 +129,6 @@ managerServlet.inService=ECHEC - Une opération de gestion 
est déjà en cours p
 managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été 
fournis pour la commande [{0}]
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été 
spécifié
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual 
host) [{0}]
-managerServlet.listitem={0} : {1} : {2} : {3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 3cea8c7..044bac2 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -131,7 +131,6 @@ managerServlet.inService=FAIL -

[tomcat] 03/03: Update

2020-07-07 Thread markt

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

commit 3bd8d73acd61a20db41d02e16e46741dbcc0a2cf
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76ecd4f..cb32064 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Remove `hostManagerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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

commit d5dfd5b1ee7ab2c46ddb35756d7d00b8040737ca
Author: Fabien Zindy 
AuthorDate: Thu Jul 2 00:34:36 2020 +0200

Remove `hostManagerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/host/HostManagerServlet.java   | 3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties   | 1 -
 java/org/apache/catalina/manager/host/LocalStrings_es.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_fr.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ru.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 5f05f8e..093fce2 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -522,8 +522,7 @@ public class HostManagerServlet
 Host host = (Host) container;
 String name = host.getName();
 String[] aliases = host.findAliases();
-writer.println(smClient.getString("hostManagerServlet.listitem",
-name, StringUtils.join(aliases)));
+writer.println(String.format("[%s]:[%s]", name, 
StringUtils.join(aliases)));
 }
 }
 
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties 
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 60dbb67..5e549f3 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception 
[{0}]
 hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
 hostManagerServlet.list=list: Listing hosts for engine [{0}]
 hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index d53a50c..732a0f4 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción 
[{0}]
 hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre 
inválido de máquina [{0}]
 hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
 hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
 hostManagerServlet.noCommand=FALLO - No se ha especificado comando
 hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index e12aedd..ad93dfc 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
 hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été 
spécifié
 hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
 hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
 hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
 hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index 4eb6414..8bf88a8 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL  - 例外[{0}]が発生しました
 hostManagerServlet.invalidHostName=FAIL  - 無効なホスト名[{0}]が指定されました
 hostManagerServlet.list=リスト：Engine[{0}]のHostのリスト
 hostManagerServlet.listed=OK - 列挙されたHost
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - manager.xml をインストールできませんでした。
 hostManagerServlet.noCommand=FAIL - コマンドが指定されませんでした。

[tomcat] branch 9.0.x updated (5cd1a5d -> 3192468)

2020-07-07 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 5cd1a5d  Add release date for Apache Tomcat 9.0.37
 new 6a842c1  Remove the `managerServlet.listitem` from the localized 
strings
 new 00c44ca  Remove `hostManagerServlet.listitem` from the localized 
strings
 new 3192468  Update

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 java/org/apache/catalina/manager/host/HostManagerServlet.java |  3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties   |  1 -
 webapps/docs/changelog.xml|  9 +
 18 files changed, 17 insertions(+), 21 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/03: Remove `hostManagerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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

commit 00c44cae814b1d529f001e6adbecc67e2e9b7adc
Author: Fabien Zindy 
AuthorDate: Thu Jul 2 00:34:36 2020 +0200

Remove `hostManagerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/host/HostManagerServlet.java   | 3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties   | 1 -
 java/org/apache/catalina/manager/host/LocalStrings_es.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_fr.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ru.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index e6d4901..f825ac9 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -522,8 +522,7 @@ public class HostManagerServlet
 Host host = (Host) container;
 String name = host.getName();
 String[] aliases = host.findAliases();
-writer.println(smClient.getString("hostManagerServlet.listitem",
-name, StringUtils.join(aliases)));
+writer.println(String.format("[%s]:[%s]", name, 
StringUtils.join(aliases)));
 }
 }
 
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties 
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 60dbb67..5e549f3 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception 
[{0}]
 hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
 hostManagerServlet.list=list: Listing hosts for engine [{0}]
 hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index d53a50c..732a0f4 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción 
[{0}]
 hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre 
inválido de máquina [{0}]
 hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
 hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
 hostManagerServlet.noCommand=FALLO - No se ha especificado comando
 hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index e12aedd..ad93dfc 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
 hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été 
spécifié
 hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
 hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
 hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
 hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index 4eb6414..8bf88a8 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL  - 例外[{0}]が発生しました
 hostManagerServlet.invalidHostName=FAIL  - 無効なホスト名[{0}]が指定されました
 hostManagerServlet.list=リスト：Engine[{0}]のHostのリスト
 hostManagerServlet.listed=OK - 列挙されたHost
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - manager.xml をインストールできませんでした。
 hostManagerServlet.noCommand=FAIL - コマンドが指定されませんでした。

[tomcat] 01/03: Remove the `managerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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

commit 6a842c1bf96939187f907cca591ffdd5742f59b6
Author: Fabien Zindy 
AuthorDate: Tue Jun 30 21:04:14 2020 +0200

Remove the `managerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 96f28d3..fcc05f6 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -146,7 +146,6 @@ managerServlet.inService=FAIL - The application [{0}] is 
already being serviced
 managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command 
[{0}]
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
 managerServlet.noCommand=FAIL - No command was specified
 managerServlet.noContext=FAIL - No context exists named [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties 
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index 21eb39d..856d389 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.deployed=OK - Anwendung mit Kontext Pfad [{0}] 
installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
 managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server 
[{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt 
werden.
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
 managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 28c7e72..743e99c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -86,7 +86,6 @@ managerServlet.findleaksNone=OK - No se han hallado fallos de 
memoria
 managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para 
el comando [{0}]
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida 
de contexto [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
 managerServlet.noContext=FALLO - No existe contexto para trayectoria [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index ac83147..3639e1d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -144,7 +144,6 @@ managerServlet.inService=ECHEC - Une opération de gestion 
est déjà en cours p
 managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été 
fournis pour la commande [{0}]
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été 
spécifié
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual 
host) [{0}]
-managerServlet.listitem={0} : {1} : {2} : {3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index bc2f26e..359056f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -146,7 +146,6 @@ managerServlet.inService=FAIL -

[tomcat] 03/03: Update

2020-07-07 Thread markt

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

commit 3192468236f2e320ac524c90906647fcb6be3d71
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0bf321c..8f4fefe 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Update

2020-07-07 Thread markt

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 6d83d06  Update
6d83d06 is described below

commit 6d83d068699c3d4ad18cd69f01f38d9c81972cb5
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc799f2..cd84d7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Remove `hostManagerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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 d8f5ca6d72e8d3a9925df0fc60745347cb4795fa
Author: Fabien Zindy 
AuthorDate: Thu Jul 2 00:34:36 2020 +0200

Remove `hostManagerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/host/HostManagerServlet.java   | 3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties   | 1 -
 java/org/apache/catalina/manager/host/LocalStrings_es.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_fr.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ja.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ko.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_ru.properties| 1 -
 java/org/apache/catalina/manager/host/LocalStrings_zh_CN.properties | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index b18f413..4d548c6 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -523,8 +523,7 @@ public class HostManagerServlet
 Host host = (Host) container;
 String name = host.getName();
 String[] aliases = host.findAliases();
-writer.println(smClient.getString("hostManagerServlet.listitem",
-name, StringUtils.join(aliases)));
+writer.println(String.format("[%s]:[%s]", name, 
StringUtils.join(aliases)));
 }
 }
 
diff --git a/java/org/apache/catalina/manager/host/LocalStrings.properties 
b/java/org/apache/catalina/manager/host/LocalStrings.properties
index 60dbb67..5e549f3 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL - Encountered exception 
[{0}]
 hostManagerServlet.invalidHostName=FAIL - Invalid host name [{0}] was specified
 hostManagerServlet.list=list: Listing hosts for engine [{0}]
 hostManagerServlet.listed=OK - Listed hosts
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - Couldn't install manager.xml
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.noHost=FAIL - Host name [{0}] does not exist
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
index d53a50c..732a0f4 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_es.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FALLO - Encontrada excepción 
[{0}]
 hostManagerServlet.invalidHostName=FALLO - Se ha especificado un nombre 
inválido de máquina [{0}]
 hostManagerServlet.list=listar: Listando máquinas para motor [{0}]
 hostManagerServlet.listed=OK - Máquinas listadas
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FALLO - no pude instalar manager.xml
 hostManagerServlet.noCommand=FALLO - No se ha especificado comando
 hostManagerServlet.noHost=FALLO - El nombre de máquina [{0}] no existe
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
index e12aedd..ad93dfc 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_fr.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=ECHEC - Exception [{0}]
 hostManagerServlet.invalidHostName=ECHEC - Un nom d''hôte [{0}] invalide a été 
spécifié
 hostManagerServlet.list=list : Liste des hôte pour le moteur [{0}]
 hostManagerServlet.listed=OK - Liste des hôtes
-hostManagerServlet.listitem=[{0}] : [{1}]
 hostManagerServlet.managerXml=ECHEC - "manager.xml" n'a pas pu être installé
 hostManagerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 hostManagerServlet.noHost=ECHEC - Le nom d''hôte [{0}] n''existe pas
diff --git a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
index 4eb6414..8bf88a8 100644
--- a/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/host/LocalStrings_ja.properties
@@ -28,7 +28,6 @@ hostManagerServlet.exception=FAIL  - 例外[{0}]が発生しました
 hostManagerServlet.invalidHostName=FAIL  - 無効なホスト名[{0}]が指定されました
 hostManagerServlet.list=リスト：Engine[{0}]のHostのリスト
 hostManagerServlet.listed=OK - 列挙されたHost
-hostManagerServlet.listitem=[{0}]:[{1}]
 hostManagerServlet.managerXml=FAIL - manager.xml をインストールできませんでした。
 hostManagerServlet.noCommand=FAIL - コマンドが指定されませんでした。

[tomcat] 01/02: Remove the `managerServlet.listitem` from the localized strings

2020-07-07 Thread markt

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 505ab516d789054c9989cf51b0a3e5f3fd46d151
Author: Fabien Zindy 
AuthorDate: Tue Jun 30 21:04:14 2020 +0200

Remove the `managerServlet.listitem` from the localized strings
---
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings.properties 
b/java/org/apache/catalina/manager/LocalStrings.properties
index 96f28d3..fcc05f6 100644
--- a/java/org/apache/catalina/manager/LocalStrings.properties
+++ b/java/org/apache/catalina/manager/LocalStrings.properties
@@ -146,7 +146,6 @@ managerServlet.inService=FAIL - The application [{0}] is 
already being serviced
 managerServlet.invalidCommand=FAIL - Invalid parameters supplied for command 
[{0}]
 managerServlet.invalidPath=FAIL - Invalid context path [{0}] was specified
 managerServlet.listed=OK - Listed applications for virtual host [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FAIL - Unable to create directory [{0}]
 managerServlet.noCommand=FAIL - No command was specified
 managerServlet.noContext=FAIL - No context exists named [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties 
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index 21eb39d..856d389 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -70,7 +70,6 @@ managerServlet.deployed=OK - Anwendung mit Kontext Pfad [{0}] 
installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten [{0}]
 managerServlet.invalidPath=FEHLER - Ungültiger Kontext Pfad [{0}] angegeben
 managerServlet.listed=OK - Auflistung der Webanwendungen für virtuellen Server 
[{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=Fehler - Das Verzeichnis [{0}] konnte nicht erstellt 
werden.
 managerServlet.noCommand=FEHLER - Es wurde kein Kommando angegeben
 managerServlet.noContext=FEHLER - Es existiert kein Kontext für Pfad [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties 
b/java/org/apache/catalina/manager/LocalStrings_es.properties
index 28c7e72..743e99c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -86,7 +86,6 @@ managerServlet.findleaksNone=OK - No se han hallado fallos de 
memoria
 managerServlet.invalidCommand=Fallo - Se proveiron parámetros inválidos para 
el comando [{0}]
 managerServlet.invalidPath=FALLO - Se ha especificado una trayectoria inválida 
de contexto [{0}]
 managerServlet.listed=OK - Aplicaciones listadas para máquina virtual [{0}]
-managerServlet.listitem={0}:{1}:{2}:{3}
 managerServlet.mkdirFail=FALLO - No pude crear directorio [{0}]
 managerServlet.noCommand=FALLO - No se ha especificado comando
 managerServlet.noContext=FALLO - No existe contexto para trayectoria [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index ac83147..3639e1d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -144,7 +144,6 @@ managerServlet.inService=ECHEC - Une opération de gestion 
est déjà en cours p
 managerServlet.invalidCommand=ECHEC - Des paramètres incorrects ont été 
fournis pour la commande [{0}]
 managerServlet.invalidPath=ECHEC - Un chemin de contexte invalide [{0}] a été 
spécifié
 managerServlet.listed=OK - Applications listées pour l''hôte virtuel (virtual 
host) [{0}]
-managerServlet.listitem={0} : {1} : {2} : {3}
 managerServlet.mkdirFail=ECHEC - Le répertoire [{0}] n''a pas pu être créé
 managerServlet.noCommand=ECHEC - Aucune commande n'a été spécifiée
 managerServlet.noContext=ECHEC - Aucun contexte n''existe pour le chemin [{0}]
diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties 
b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index bc2f26e..359056f 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -146,7 +146,6 @@ managerServlet.inService=FAIL -

[GitHub] [tomcat] markt-asf commented on pull request #310: Remove extraneous spaces around the colons of the output of the contexts list in the text-based manager

2020-07-07 Thread GitBox



markt-asf commented on pull request #310:
URL: https://github.com/apache/tomcat/pull/310#issuecomment-654739480


   Thanks for the PR. I've applied it to 10.0.x and I'll back-port it shortly.
   I merged this manually so I could squash it into two commits and fix the 
indenting.



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 #310: Remove extraneous spaces around the colons of the output of the contexts list in the text-based manager

2020-07-07 Thread GitBox



markt-asf closed pull request #310:
URL: https://github.com/apache/tomcat/pull/310


   



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 (1d5edc9 -> d8f5ca6)

2020-07-07 Thread markt

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 1d5edc9  Add release date for Apache Tomcat 10.0.0-M7
 new 505ab51  Remove the `managerServlet.listitem` from the localized 
strings
 new d8f5ca6  Remove `hostManagerServlet.listitem` from the localized 
strings

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/manager/LocalStrings.properties  |  1 -
 java/org/apache/catalina/manager/LocalStrings_de.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_es.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_fr.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ja.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ko.properties   |  1 -
 java/org/apache/catalina/manager/LocalStrings_ru.properties   |  1 -
 .../org/apache/catalina/manager/LocalStrings_zh_CN.properties |  1 -
 java/org/apache/catalina/manager/ManagerServlet.java  | 11 +++
 java/org/apache/catalina/manager/host/HostManagerServlet.java |  3 +--
 java/org/apache/catalina/manager/host/LocalStrings.properties |  1 -
 .../apache/catalina/manager/host/LocalStrings_es.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_fr.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ja.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ko.properties   |  1 -
 .../apache/catalina/manager/host/LocalStrings_ru.properties   |  1 -
 .../catalina/manager/host/LocalStrings_zh_CN.properties   |  1 -
 17 files changed, 8 insertions(+), 21 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] jfclere commented on pull request #309: Allow recursive substitution of properties.

2020-07-07 Thread GitBox



jfclere commented on pull request #309:
URL: https://github.com/apache/tomcat/pull/309#issuecomment-654734467


   I will work again next week on the PR, thank for you patience.



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

Re: Improving SameSite support

2020-07-07 Thread Rémy Maucherat

On Mon, Jul 6, 2020 at 9:27 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> All,
>
> Jakarta EE 5.0 does not appear to include support for SameSite
> cookies. Tomcat's CookieProcessor allows an administrator to set the
> SameSite cookie policy, but it's a blanket policy.
>
> So for example, if you want a JSESSIONID cookie to be "strict" but
> some other cookie (e.g. "FOO") to be "unset" or "lax" or whatever, you
> will have to manually-build your "Set-Cookie" headers for your FOO cooki
> e.
>
> This is not terribly convenient.
>
> Unfortunately, *any* solution to this problem will be
> container-specific. The current Tomcat solution is of course a
> solution only for Tomcat, and only for versions which contain that
> SameSite support.
>
> I'm wondering if we can do better.
>
> Instead of a single "sameSiteCookies" setting which applies to *all*
> cookies, perhaps the CookieProcessor could have a different policy for
> specific cookies. Something like this:
>
>  className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
> sameSiteCookies="unset">
>   
>   
>   ...
> 
>
> In the above setup, the "sameSiteCookie" attribute of the
> CookieProcessor sets the default policy for the CookieProcessor. Then,
> each of the  elements sets the policy for a specific
> cookie by name.
>
> This would allow applications to set their policies without having to
> construct their own Set-Cookie response headers, handle encoding, etc.
> and it would also inherit any other Tomcat-supplied cookie-related
> policies.
>
> Another option would be to provide a subclass of j.s.h.Cookie which
> includes a setSameSite(String) method. The CookieProcessor could check
> for instanceof EnhancedCookie (or whatever) and use that setting for
> each Cookie object. But that seems like less of a good idea -- except
> that it would be easier for refactoring tools to locate instances of
> the Tomcat-specific Cookie class and replace them with a future
> SameSite-supporting official Jakarta EE Cookie class.
>
> WDYT?
>

This is a big configuration and API change. Adding a new element is
significant, so maybe an expanded syntax could be added to the attribute
instead (ex: "unset,JSESSIONID=strict,FOO=lax"; or maybe a more compact
"unset;strict=JSESSIONID,FOO;lax=BAR"). It's still a breaking change though.

Rémy


>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl8DexAACgkQHPApP6U8
> pFjDZBAAiaKBAla3DJ+SHvHTkADOeGXqrMX9kbrIZB3ajnq+m4MEWPH6dmQrg9+j
> ROcPVNsj8gahrJSWEzvdu7bQc96tWQ8RD265DQ1pbjwNCfWGHMM8FPJaRp4DO7av
> zvWMtNLI/Sv+63CmZr27mzE1o/iJturdNAu/12kOUDd5RVVnM8CROKVtE5rmbVN8
> dFQIuMD6mQov+J+Eqg6sqJLPVNoxcjRo25QsrfEOUnsbXx+0sHCe0QMiv4wgMf3G
> LnPEY7GhOBOcjaN6lWENAWAkeuoUZIlVpbndk6RRihziSGNAZ+uNORy54mP8SGkR
> z33lWKMIolYBBqcmvuFy7OOsfdLGI50kUIc05Hd+T9XMO4p7OSOeJDwvGTmN6Kie
> 2ZChodQYnWEN//VrD0UxN7t4rlujXF0sS40hryoehzDge/UjVFabR/nEKsySWigR
> eddvNhumWqxtjEt8K+/5um366ybVr6VkzpaGfBZ6inzYZtmLmMNr1xd/hz9V5c7j
> 4KZiGvB5qxZpcrNtmiYJHYzEE8PHauGsEUzG08Skd4SJmo6TkyvefdnaPHezNOse
> Ikd78TLvPLNMEE2dUqZ508wYTmR14/ZEiEOt2IUYHD1Dk1oFOgmnR8jbG6+ONZMp
> Fjmv5qWfAAeGmWsuMUCHpiz0w3LGJGGlrLur1NXwLkhtz+epx4M=
> =dJAO
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

58 matches

Mail list logo