Re: [tomcat] branch master updated: Fix BZ 64403 Compressed h2 responses should not have C-L header

[Martin Grigorov]

On Mon, May 4, 2020 at 11:06 PM  wrote:

> 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 956d9f7  Fix BZ 64403 Compressed h2 responses should not have C-L
> header
> 956d9f7 is described below
>
> commit 956d9f70279f35da45d63922607b328f44a5f776
> Author: Mark Thomas 
> AuthorDate: Mon May 4 21:06:16 2020 +0100
>
> Fix BZ 64403 Compressed h2 responses should not have C-L header
>
> https://bz.apache.org/bugzilla/show_bug.cgi?id=64403
> ---
>  java/org/apache/coyote/http2/StreamProcessor.java  | 19 ++---
>  .../apache/coyote/http2/TestStreamProcessor.java   | 81
> ++
>  webapps/docs/changelog.xml |  5 ++
>  3 files changed, 97 insertions(+), 8 deletions(-)
>
> diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
> b/java/org/apache/coyote/http2/StreamProcessor.java
> index 15bfcab..e03f307 100644
> --- a/java/org/apache/coyote/http2/StreamProcessor.java
> +++ b/java/org/apache/coyote/http2/StreamProcessor.java
> @@ -147,6 +147,17 @@ class StreamProcessor extends AbstractProcessor {
>  // Add the pseudo header for status
>
>  headers.addValue(":status").setString(Integer.toString(statusCode));
>
> +
> +// Compression can't be used with sendfile
> +// Need to check for compression (and set headers appropriately)
> before
> +// adding headers below
> +if (noSendfile && protocol != null &&
> +protocol.useCompression(coyoteRequest, coyoteResponse)) {
> +// Enable compression. Headers will have been set. Need to
> configure
> +// output filter at this point.
> +stream.addOutputFilter(new GzipOutputFilter());
> +}
> +
>  // Check to see if a response body is present
>  if (!(statusCode < 200 || statusCode == 204 || statusCode == 205
> || statusCode == 304)) {
>  String contentType = coyoteResponse.getContentType();
> @@ -178,14 +189,6 @@ class StreamProcessor extends AbstractProcessor {
>  if (statusCode >= 200 && headers.getValue("date") == null) {
>
>  headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
>  }
> -
> -// Compression can't be used with sendfile
> -if (noSendfile && protocol != null &&
> -protocol.useCompression(coyoteRequest, coyoteResponse)) {
> -// Enable compression. Headers will have been set. Need to
> configure
> -// output filter at this point.
> -stream.addOutputFilter(new GzipOutputFilter());
> -}
>  }
>
>
> diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java
> b/test/org/apache/coyote/http2/TestStreamProcessor.java
> index 214a65e..e72be5f 100644
> --- a/test/org/apache/coyote/http2/TestStreamProcessor.java
> +++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
> @@ -18,6 +18,7 @@ package org.apache.coyote.http2;
>
>  import java.io.File;
>  import java.io.IOException;
> +import java.io.OutputStream;
>  import java.io.PrintWriter;
>  import java.nio.ByteBuffer;
>  import java.util.ArrayList;
> @@ -34,6 +35,7 @@ import org.junit.Test;
>
>  import org.apache.catalina.Context;
>  import org.apache.catalina.Wrapper;
> +import org.apache.catalina.connector.Connector;
>  import org.apache.catalina.startup.Tomcat;
>  import org.apache.tomcat.util.compat.JrePlatform;
>  import org.apache.tomcat.util.http.FastHttpDateFormat;
> @@ -223,4 +225,83 @@ public class TestStreamProcessor extends
> Http2TestBase {
>  });
>  }
>  }
> +
> +
> +@Test
> +public void testCompression() throws Exception {
> +enableHttp2();
> +
> +Tomcat tomcat = getTomcatInstance();
> +
> +Context ctxt = tomcat.addContext("", null);
> +Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
> +ctxt.addServletMappingDecoded("/simple", "simple");
> +Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
> +ctxt.addServletMappingDecoded("/compression", "compression");
> +
>




> +// Enable compression for the LargeServlet
>

What is LargeServlet ?
There are only SimpleServlet and CompressionServlet in this test.


> +Connector connector = tomcat.getConnector();
> +Assert.assertTrue(connector.setProperty("compression", "on"));
> +
> +tomcat.start();
> +
> +enableHttp2();
> +openClientConnection();
> +doHttpUpgrade();
> +sendClientPreface();
> +validateHttp2InitialResponse();
> +
> +
> +byte[] frameHeader = new byte[9];
> +ByteBuffer headersPayload = ByteBuffer.allocate(128);
> +
> +List headers = new ArrayList<>(3);
> +headers.add(new Header(":method", "GET"));
> +headers.add(new 

[jira] [Commented] (MTOMCAT-320) Error 400

[Martin Tzvetanov Grigorov (Jira)]

[ 
https://issues.apache.org/jira/browse/MTOMCAT-320?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17099537#comment-17099537
 ] 

Martin Tzvetanov Grigorov commented on MTOMCAT-320:
---

Please use us...@tomcat.apache.org for questions.

The description of this ticket does not provide enough information and the 
ticket should be closed as "Not a problem"

> Error 400
> -
>
> Key: MTOMCAT-320
> URL: https://issues.apache.org/jira/browse/MTOMCAT-320
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Request
>  Components: tomcat7
>Affects Versions: 2.2
>Reporter: Rahul Govind Londhe
>Assignee: Olivier Lamy
>Priority: Major
>
> Using enctype="multipart/form-data" trying to upload file but it throwing Bad 
> Request(400) error.
>  
> Need Help
> 8208064913



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

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

buildbot failure in on tomcat-85-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 95b4827c9d59b01807d637b5dcadda26e4ff83fa
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 64403] HTTP/2 with compression does not unset Content-Length

[bugzilla]

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

--- Comment #2 from Mike Noordermeer  ---
Thanks for the fix!

Yes, I was wondering about that too, IIRC the spec requires clients to drop
such invalid responses.

-- 
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 9.0.x updated: Update to bnd 5.0.1

[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 0155352  Update to bnd 5.0.1
0155352 is described below

commit 0155352f8308b675516e88c83305542aa893110a
Author: Mark Thomas 
AuthorDate: Mon May 4 21:51:10 2020 +0100

Update to bnd 5.0.1

Note: This won't fix the build issue with Java 15 EA but it gets us on
the latest version
---
 build.properties.default   | 8 
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index a2230ea..54ef861 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,16 +288,16 @@ 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
 
 # - bnd & bndlib, version 4.0.0 or later  -
 # - provides OSGI metadata for JARs   -
-bnd.version=4.2.0
+bnd.version=5.0.1
 
-# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar
+# checksums for biz.aQute.bnd-5.0.1.jar, biz.aQute.bndlib-5.0.1.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43
+bnd.checksum.value=42cb2f3bbb5556f0182131c6543f1579|67d8bb4f274e8ecfd8ebfcdeed3b328f7078b13b
 
 bndlib.checksum.enabled=true
 bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=7519e890783ade99bb74608d0efbf8c4|c4fa30ac11cc0bf27b1f706ac8ebae8cec358e77
+bndlib.checksum.value=9d29031f80e3b94e3578fea75b45c8e6|aa13aef49a74fe0bd8bbcb016df124bab5d4064e
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e981152..479714c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,9 @@
 Improve the coverage and quality of the Korean translations provided
 with Apache Tomcat. (woonsan)
   
+  
+Update dependency on bnd to 5.0.1. (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 to bnd 5.0.1

[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 7b906a8  Update to bnd 5.0.1
7b906a8 is described below

commit 7b906a87768cabff60eee67572c82165625b4207
Author: Mark Thomas 
AuthorDate: Mon May 4 21:51:10 2020 +0100

Update to bnd 5.0.1

Note: This won't fix the build issue with Java 15 EA but it gets us on
the latest version
---
 build.properties.default   | 8 
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 928ba87..d550071 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,16 +288,16 @@ 
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-
 
 # - bnd & bndlib, version 4.0.0 or later  -
 # - provides OSGI metadata for JARs   -
-bnd.version=4.2.0
+bnd.version=5.0.1
 
-# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar
+# checksums for biz.aQute.bnd-5.0.1.jar, biz.aQute.bndlib-5.0.1.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43
+bnd.checksum.value=42cb2f3bbb5556f0182131c6543f1579|67d8bb4f274e8ecfd8ebfcdeed3b328f7078b13b
 
 bndlib.checksum.enabled=true
 bndlib.checksum.algorithm=MD5|SHA-1
-bndlib.checksum.value=7519e890783ade99bb74608d0efbf8c4|c4fa30ac11cc0bf27b1f706ac8ebae8cec358e77
+bndlib.checksum.value=9d29031f80e3b94e3578fea75b45c8e6|aa13aef49a74fe0bd8bbcb016df124bab5d4064e
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 887d93b..ac0f7e0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -243,6 +243,9 @@
 Improve the coverage and quality of the Korean translations provided
 with Apache Tomcat. (woonsan)
   
+  
+Update dependency on bnd to 5.0.1. (markt)
+  
 
   
 


-
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

[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/220

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] 1d9585b86b13df8b069be36c2cc10c1fed94e756
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

Re: OpenJDK 15 EA build 21 is now available

[Mark Thomas]

On 02/05/2020 06:25, Martin Grigorov wrote:
> Hi,
> 
> On Fri, May 1, 2020 at 9:41 PM Martin Grigorov  > wrote:
> 
> Hi,
> 
> I think this is the same issue I had in Apache Wicket with the last
> two builds of JDK 15.
> I'll send more details tomorrow. 
> But I worked it around by using aQute 5.1-SNAPSHOT.

Confirmed. This is a bnd bug that has been fixed in the 5.1.0-SNAPSHOT.

> It has been fixed with:
> https://github.com/bndtools/bnd/issues/3903
> https://github.com/bndtools/bnd/commit/97eb299a8b4b3d1b199b30d98769136494e2469d#diff-8dd8393f6487d4e378e923003227cf57
>  
> I don't see any recent improvements around
> aQute.bnd.ant.WrapTask.execute(WrapTask.java:122)
> (https://github.com/bndtools/bnd/commits/master/biz.aQute.bnd/src/aQute/bnd/ant/WrapTask.java)

The Ant wrapper is hiding the real exception. This is the same issues as
3903.

Thanks for the pointer. That really speed up finding and confirming the fix.

Mark

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

[Bug 64403] HTTP/2 with compression does not unset Content-Length

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Thanks for the report. I'm surprised the clients didn't reject the response
entirely.

Fixed in:
- master for 10.0.0-M5 onwards
- 9.0.x for 9.0.35 onwards
- 8.5.x for 8.5.55 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 8.5.x updated: Fix BZ 64403 Compressed h2 responses should not have C-L header

[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 95b4827  Fix BZ 64403 Compressed h2 responses should not have C-L 
header
95b4827 is described below

commit 95b4827c9d59b01807d637b5dcadda26e4ff83fa
Author: Mark Thomas 
AuthorDate: Mon May 4 21:06:16 2020 +0100

Fix BZ 64403 Compressed h2 responses should not have C-L header

https://bz.apache.org/bugzilla/show_bug.cgi?id=64403
---
 java/org/apache/coyote/http2/StreamProcessor.java  | 16 +++--
 .../apache/coyote/http2/TestStreamProcessor.java   | 81 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
b/java/org/apache/coyote/http2/StreamProcessor.java
index be6a353..6839b43 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -125,6 +125,16 @@ class StreamProcessor extends AbstractProcessor {
 // Add the pseudo header for status
 headers.addValue(":status").setString(Integer.toString(statusCode));
 
+
+// Compression can't be used with sendfile
+// Need to check for compression (and set headers appropriately) before
+// adding headers below
+if (protocol != null && protocol.useCompression(coyoteRequest, 
coyoteResponse)) {
+// Enable compression. Headers will have been set. Need to 
configure
+// output filter at this point.
+stream.addOutputFilter(new GzipOutputFilter());
+}
+
 // Check to see if a response body is present
 if (!(statusCode < 200 || statusCode == 204 || statusCode == 205 || 
statusCode == 304)) {
 String contentType = coyoteResponse.getContentType();
@@ -156,12 +166,6 @@ class StreamProcessor extends AbstractProcessor {
 if (statusCode >= 200 && headers.getValue("date") == null) {
 
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
 }
-
-if (protocol != null && protocol.useCompression(coyoteRequest, 
coyoteResponse)) {
-// Enable compression. Headers will have been set. Need to 
configure
-// output filter at this point.
-stream.addOutputFilter(new GzipOutputFilter());
-}
 }
 
 
diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index a4dd5f1..a46e1b2 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -223,4 +225,83 @@ public class TestStreamProcessor extends Http2TestBase {
 });
 }
 }
+
+
+@Test
+public void testCompression() throws Exception {
+enableHttp2();
+
+Tomcat tomcat = getTomcatInstance();
+
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
+ctxt.addServletMappingDecoded("/simple", "simple");
+Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
+ctxt.addServletMappingDecoded("/compression", "compression");
+
+// Enable compression for the LargeServlet
+Connector connector = tomcat.getConnector();
+Assert.assertTrue(connector.setProperty("compression", "on"));
+
+tomcat.start();
+
+enableHttp2();
+openClientConnection();
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+
+byte[] frameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+
+List headers = new ArrayList<>(3);
+headers.add(new Header(":method", "GET"));
+headers.add(new Header(":scheme", "http"));
+headers.add(new Header(":path", "/compression"));
+headers.add(new Header(":authority", "localhost:" + getPort()));
+headers.add(new Header("accept-encoding", "gzip"));
+
+buildGetRequest(frameHeader, headersPayload, null, headers, 3);
+
+writeFrame(frameHeader, headersPayload);
+
+readSimpleGetResponse();
+
+Assert.assertEquals(
+"3-HeadersStart\n" +
+

[tomcat] branch 9.0.x updated: Fix BZ 64403 Compressed h2 responses should not have C-L header

[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 1d9585b  Fix BZ 64403 Compressed h2 responses should not have C-L 
header
1d9585b is described below

commit 1d9585b86b13df8b069be36c2cc10c1fed94e756
Author: Mark Thomas 
AuthorDate: Mon May 4 21:06:16 2020 +0100

Fix BZ 64403 Compressed h2 responses should not have C-L header

https://bz.apache.org/bugzilla/show_bug.cgi?id=64403
---
 java/org/apache/coyote/http2/StreamProcessor.java  | 19 ++---
 .../apache/coyote/http2/TestStreamProcessor.java   | 81 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
b/java/org/apache/coyote/http2/StreamProcessor.java
index 15bfcab..e03f307 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -147,6 +147,17 @@ class StreamProcessor extends AbstractProcessor {
 // Add the pseudo header for status
 headers.addValue(":status").setString(Integer.toString(statusCode));
 
+
+// Compression can't be used with sendfile
+// Need to check for compression (and set headers appropriately) before
+// adding headers below
+if (noSendfile && protocol != null &&
+protocol.useCompression(coyoteRequest, coyoteResponse)) {
+// Enable compression. Headers will have been set. Need to 
configure
+// output filter at this point.
+stream.addOutputFilter(new GzipOutputFilter());
+}
+
 // Check to see if a response body is present
 if (!(statusCode < 200 || statusCode == 204 || statusCode == 205 || 
statusCode == 304)) {
 String contentType = coyoteResponse.getContentType();
@@ -178,14 +189,6 @@ class StreamProcessor extends AbstractProcessor {
 if (statusCode >= 200 && headers.getValue("date") == null) {
 
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
 }
-
-// Compression can't be used with sendfile
-if (noSendfile && protocol != null &&
-protocol.useCompression(coyoteRequest, coyoteResponse)) {
-// Enable compression. Headers will have been set. Need to 
configure
-// output filter at this point.
-stream.addOutputFilter(new GzipOutputFilter());
-}
 }
 
 
diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index a4dd5f1..a46e1b2 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -223,4 +225,83 @@ public class TestStreamProcessor extends Http2TestBase {
 });
 }
 }
+
+
+@Test
+public void testCompression() throws Exception {
+enableHttp2();
+
+Tomcat tomcat = getTomcatInstance();
+
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
+ctxt.addServletMappingDecoded("/simple", "simple");
+Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
+ctxt.addServletMappingDecoded("/compression", "compression");
+
+// Enable compression for the LargeServlet
+Connector connector = tomcat.getConnector();
+Assert.assertTrue(connector.setProperty("compression", "on"));
+
+tomcat.start();
+
+enableHttp2();
+openClientConnection();
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+
+byte[] frameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+
+List headers = new ArrayList<>(3);
+headers.add(new Header(":method", "GET"));
+headers.add(new Header(":scheme", "http"));
+headers.add(new Header(":path", "/compression"));
+headers.add(new Header(":authority", "localhost:" + getPort()));
+headers.add(new Header("accept-encoding", "gzip"));
+
+buildGetRequest(frameHeader, headersPayload, null, headers, 3);
+
+writeFrame(frameHeader, headersPayload);
+
+

[tomcat] branch master updated: Fix BZ 64403 Compressed h2 responses should not have C-L header

[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 956d9f7  Fix BZ 64403 Compressed h2 responses should not have C-L 
header
956d9f7 is described below

commit 956d9f70279f35da45d63922607b328f44a5f776
Author: Mark Thomas 
AuthorDate: Mon May 4 21:06:16 2020 +0100

Fix BZ 64403 Compressed h2 responses should not have C-L header

https://bz.apache.org/bugzilla/show_bug.cgi?id=64403
---
 java/org/apache/coyote/http2/StreamProcessor.java  | 19 ++---
 .../apache/coyote/http2/TestStreamProcessor.java   | 81 ++
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
b/java/org/apache/coyote/http2/StreamProcessor.java
index 15bfcab..e03f307 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -147,6 +147,17 @@ class StreamProcessor extends AbstractProcessor {
 // Add the pseudo header for status
 headers.addValue(":status").setString(Integer.toString(statusCode));
 
+
+// Compression can't be used with sendfile
+// Need to check for compression (and set headers appropriately) before
+// adding headers below
+if (noSendfile && protocol != null &&
+protocol.useCompression(coyoteRequest, coyoteResponse)) {
+// Enable compression. Headers will have been set. Need to 
configure
+// output filter at this point.
+stream.addOutputFilter(new GzipOutputFilter());
+}
+
 // Check to see if a response body is present
 if (!(statusCode < 200 || statusCode == 204 || statusCode == 205 || 
statusCode == 304)) {
 String contentType = coyoteResponse.getContentType();
@@ -178,14 +189,6 @@ class StreamProcessor extends AbstractProcessor {
 if (statusCode >= 200 && headers.getValue("date") == null) {
 
headers.addValue("date").setString(FastHttpDateFormat.getCurrentDate());
 }
-
-// Compression can't be used with sendfile
-if (noSendfile && protocol != null &&
-protocol.useCompression(coyoteRequest, coyoteResponse)) {
-// Enable compression. Headers will have been set. Need to 
configure
-// output filter at this point.
-stream.addOutputFilter(new GzipOutputFilter());
-}
 }
 
 
diff --git a/test/org/apache/coyote/http2/TestStreamProcessor.java 
b/test/org/apache/coyote/http2/TestStreamProcessor.java
index 214a65e..e72be5f 100644
--- a/test/org/apache/coyote/http2/TestStreamProcessor.java
+++ b/test/org/apache/coyote/http2/TestStreamProcessor.java
@@ -18,6 +18,7 @@ package org.apache.coyote.http2;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -34,6 +35,7 @@ import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.compat.JrePlatform;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
@@ -223,4 +225,83 @@ public class TestStreamProcessor extends Http2TestBase {
 });
 }
 }
+
+
+@Test
+public void testCompression() throws Exception {
+enableHttp2();
+
+Tomcat tomcat = getTomcatInstance();
+
+Context ctxt = tomcat.addContext("", null);
+Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
+ctxt.addServletMappingDecoded("/simple", "simple");
+Tomcat.addServlet(ctxt, "compression", new CompressionServlet());
+ctxt.addServletMappingDecoded("/compression", "compression");
+
+// Enable compression for the LargeServlet
+Connector connector = tomcat.getConnector();
+Assert.assertTrue(connector.setProperty("compression", "on"));
+
+tomcat.start();
+
+enableHttp2();
+openClientConnection();
+doHttpUpgrade();
+sendClientPreface();
+validateHttp2InitialResponse();
+
+
+byte[] frameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+
+List headers = new ArrayList<>(3);
+headers.add(new Header(":method", "GET"));
+headers.add(new Header(":scheme", "http"));
+headers.add(new Header(":path", "/compression"));
+headers.add(new Header(":authority", "localhost:" + getPort()));
+headers.add(new Header("accept-encoding", "gzip"));
+
+buildGetRequest(frameHeader, headersPayload, null, headers, 3);
+
+writeFrame(frameHeader, headersPayload);
+
+

[jira] [Created] (MTOMCAT-320) Error 400

[Rahul Govind Londhe (Jira)]

Rahul Govind Londhe created MTOMCAT-320:
---

 Summary: Error 400
 Key: MTOMCAT-320
 URL: https://issues.apache.org/jira/browse/MTOMCAT-320
 Project: Apache Tomcat Maven Plugin
  Issue Type: Request
  Components: tomcat7
Affects Versions: 2.2
Reporter: Rahul Govind Londhe
Assignee: Olivier Lamy


Using enctype="multipart/form-data" trying to upload file but it throwing Bad 
Request(400) error.

 

Need Help

8208064913



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

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

buildbot success in on tomcat-9-trunk

[buildbot]

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

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] 9a2f34f3c211c948ca781326659a21852fd36250
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] 04/06: Back-port updates to Japanese translations

[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 cc5d8e6a93e977c70046a5604b66e3b80de40098
Author: Mark Thomas 
AuthorDate: Mon May 4 17:52:59 2020 +0100

Back-port updates to Japanese translations
---
 .../authenticator/LocalStrings_ja.properties   |  32 ++--
 .../catalina/connector/LocalStrings_ja.properties  |   5 +-
 .../catalina/core/LocalStrings_ja.properties   |  35 +++--
 .../catalina/filters/LocalStrings_ja.properties|   6 +-
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  18 +--
 .../catalina/loader/LocalStrings_ja.properties |  10 +-
 .../catalina/manager/LocalStrings_ja.properties|  15 +-
 .../manager/host/LocalStrings_ja.properties|   6 +-
 .../catalina/realm/LocalStrings_ja.properties  |  11 +-
 .../catalina/security/LocalStrings_ja.properties   |   2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |   6 +-
 .../catalina/session/LocalStrings_ja.properties|  12 +-
 .../catalina/startup/LocalStrings_ja.properties|  56 +++
 .../tribes/tipis/LocalStrings_ja.properties|   2 +-
 .../catalina/users/LocalStrings_ja.properties  |   2 +-
 .../catalina/util/LocalStrings_ja.properties   |   4 +-
 .../catalina/valves/LocalStrings_ja.properties |  12 +-
 java/org/apache/coyote/LocalStrings_ja.properties  |   5 +-
 .../apache/coyote/ajp/LocalStrings_ja.properties   |   2 +
 .../coyote/http11/LocalStrings_ja.properties   |  24 +--
 .../jasper/resources/LocalStrings_ja.properties| 175 +++--
 .../naming/factory/LocalStrings_ja.properties  |   4 +
 .../tomcat/util/buf/LocalStrings_ja.properties |   4 +-
 .../tomcat/util/compat/LocalStrings_ja.properties  |   2 +
 .../util/descriptor/LocalStrings_ja.properties |   2 +-
 .../tomcat/util/http/LocalStrings_ja.properties|   7 +-
 .../tomcat/util/modeler/LocalStrings_ja.properties |   4 +-
 .../tomcat/websocket/LocalStrings_ja.properties|   7 +-
 .../websocket/server/LocalStrings_ja.properties|   2 +-
 .../WEB-INF/classes/LocalStrings_ja.properties |   2 +-
 30 files changed, 262 insertions(+), 212 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
index 5301f02..1205465 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
@@ -33,7 +33,7 @@ basicAuthenticator.invalidCharset=指定できる値は、null、空の文字列
 
 
digestAuthenticator.cacheRemove=有効なエントリがクライアントのnonceキャッシュから削除され、新しいエントリのためのスペースが確保されました。
 リプレイ攻撃が可能になりました。 リプレイ攻撃の可能性を防ぐには、nonceValidityを減らすか、nonceCacheSizeを増やしてください。 
このタイプの警告は5分間表示されなくなります。
 
-formAuthenticator.forwardErrorFail=予期せぬ異常によりエラーページへ転送します。
+formAuthenticator.forwardErrorFail=エラーページへ転送中の予期せぬエラー
 
formAuthenticator.forwardLogin=リクエストメソッドGETを使用してコンテキスト[{3}]のページ[{2}]にメソッド[{1}]で行われた[{0}]の要求をフォワードします。
 formAuthenticator.forwardLoginFail=ログインページへの転送での予期しないエラー
 formAuthenticator.noErrorPage=コンテキスト[{0}]のFORM認証にエラーページが定義されていません
@@ -41,27 +41,27 @@ formAuthenticator.noLoginPage=コンテキスト[{0}]のFORM認証にログイ
 
 singleSignOn.debug.associate=SSOはアプリケーションセッション[{1}]をSSOセッション[{0}]に関連付けます
 
singleSignOn.debug.associateFail=SSOセッション[{1}]が存在しないため、SSOはアプリケーションセッション[{0}]を関連付けられませんでした。
-singleSignOn.debug.cookieCheck=SSOがSSOクッキーをチェックします
+singleSignOn.debug.cookieCheck=SSOはSSOクッキーをチェックしています
 singleSignOn.debug.cookieNotFound=SSOはSSO Cookieを検出しませんでした。
-singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を期限切れにします。
+singleSignOn.debug.deregister=SSOセッション[{1}]に関連付けられたアプリケーションセッション[{0}]を破棄します。
 singleSignOn.debug.deregisterFail=キャッシュにないため、SSOセッション[{0}]の登録を解除できませんでした。
-singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しましたが、関連するアプリケーションセッションが見つかりませんでした。
+singleSignOn.debug.deregisterNone=SSOセッション[{0}]の登録を解除しましたが、関連付けられたアプリケーションセッションは見つかりませんでした。
 singleSignOn.debug.hasPrincipal=SSOが以前に認証されたプリンシパル[{0}]を検出しました
-singleSignOn.debug.invoke=[{0}]に対するSSO処理リクエスト
-singleSignOn.debug.principalCheck=SSOセッションのキャッシュされたプリンシパルを探すSSO [{0}]
+singleSignOn.debug.invoke=SSO は [{0}] に対するリクエストを処理しています
+singleSignOn.debug.principalCheck=SSO は SSO セッション [{0}] のキャッシュされたプリンシパルを探索しています
 singleSignOn.debug.principalFound=SSO のキャッシュされたプリンシパル [{0}] を取得しました。認証タイプは 
[{1}] です。
 singleSignOn.debug.principalNotFound=SSOはキャッシュされたプリンシパルを検出しませんでした。 
セッション[{0}]のSSO Cookieを消去しています。
-singleSignOn.debug.register=認証タイプ[{2}]のユーザー[{1}]のSSOセッション[{0}]を登録しているSSO
-singleSignOn.debug.removeSession=SSOセッション[{1}]からのアプリケーションセッション[{0}]の削除
-singleSignOn.debug.sessionLogout=SSOセッション[{0}]とアプリケーションセッション[{1}]のログアウトを処理するSSO。
-singleSignOn.debug.sessionTimeout=SSOはSSOセッション[{0}]とアプリケーションセッション[{1}]のタイムアウト処理中
+singleSignOn.debug.register=SSOは認証タイプ[{2}]のユーザー[{1}]のSSOセッション[{0}]を登録しています
+singleSignOn.debug.removeSession=SSOはSSOセッション[{1}]からアプリケーションセッション[{0}]を削除しています

[tomcat] 05/06: Backport updates to Korean translations

[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 5c1810a9cef7db073d391f19a49205049909e4d5
Author: Mark Thomas 
AuthorDate: Mon May 4 17:53:18 2020 +0100

Backport updates to Korean translations
---
 java/org/apache/catalina/connector/LocalStrings_ko.properties | 1 +
 java/org/apache/catalina/session/LocalStrings_ko.properties   | 2 ++
 java/org/apache/catalina/startup/LocalStrings_ko.properties   | 1 +
 java/org/apache/coyote/http11/LocalStrings_ko.properties  | 1 +
 java/org/apache/tomcat/util/buf/LocalStrings_ko.properties| 2 ++
 5 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties 
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index ac17778..ac95044 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -67,6 +67,7 @@ inputBuffer.streamClosed=스트림이 닫혔습니다.
 request.asyncNotSupported=현재 체인의 필터 또는 서블릿이, 비동기 오퍼레이션들을 지원하지 않습니다.
 request.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI fragment를 제거했습니다.
 request.notAsync=만일 현재의 쓰레드가 비동기 모드에 있지 않다면, 이 메소드를 호출하는 것은 불허됩니다. (즉, 
isAsyncStarted()가 false를 반환하는 경우)
+request.session.failed=다음 오류로 인해 세션 [{0}]을(를) 로드하지 못했습니다: [{1}]
 
 requestFacade.nullRequest=요청 객체가 이미 참조 해제 되었고, 더 이상 이 facade와 연관되지 않습니다.
 
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index 2d0bacc..29d0f12 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -75,6 +75,8 @@ standardSession.isNew.ise=isNew: 세션이 이미 무효화 되었습니다.
 standardSession.logoutfail=세션을 만료시킬 때, 사용자를 로그아웃 하는 중 예외 발생
 standardSession.notDeserializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 역직렬화할 수 없습니다.
 standardSession.notSerializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 직렬화할 수 없습니다.
+standardSession.principalNotDeserializable=세션 [{0}]을(를) 위한 Principal 객체를 역직렬화할 
수 없습니다.
+standardSession.principalNotSerializable=세션 [{0}]을(를) 위한 Principal 객체를 직렬화할 수 
없습니다.
 standardSession.removeAttribute.ise=removeAttribute: 세션이 이미 무효화되었습니다.
 standardSession.sessionEvent=세션 이벤트 리스너가 예외를 발생시켰습니다.
 standardSession.setAttribute.iae=setAttribute: 직렬화할 수 없는 속성 [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties 
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index fe3870f..2be5457 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -126,6 +126,7 @@ tomcat.addWebapp.conflictChild=이미 존재하는 컨텍스트 [{2}](으)로 
 tomcat.addWebapp.conflictFile=이미 존재하는 파일 [{2}](으)로 인하여, [{0}]에 위치한 WAR를 컨텍스트 
경로 [{1}](으)로 배치할 수 없습니다.
 tomcat.baseDirMakeFail=Base 디렉토리로서 사용하기 위한, 디렉토리 [{0}]을(를) 생성할 수 없습니다.
 tomcat.baseDirNotDir=base 디렉토리를 위해 지정된 위치 [{0}]은(는) 디렉토리가 아닙니다.
+tomcat.defaultMimeTypeMappingsFail=기본 MIME 타입들을 로드할 수 없습니다.
 
 userConfig.database=사용자 데이터베이스를 로드하는 중 예외 발생
 userConfig.deploy=사용자 [{0}]을(를) 위해 웹 애플리케이션을 배치합니다.
diff --git a/java/org/apache/coyote/http11/LocalStrings_ko.properties 
b/java/org/apache/coyote/http11/LocalStrings_ko.properties
index 17ec6f8..fb6130c 100644
--- a/java/org/apache/coyote/http11/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http11/LocalStrings_ko.properties
@@ -35,6 +35,7 @@ http11processor.socket.info=소켓에 대한 정보를 얻는 중 예외 발생
 
 iib.eof.error=소켓에서 예기치 않은 EOF를 읽었습니다.
 iib.invalidHttpProtocol=HTTP 프로토콜에서 유효하지 않은 문자가 발견되었습니다.
+iib.invalidPhase=파싱 국면 [{0}]에서, 유효하지 않은 HTTP 요청 라인 오류
 iib.invalidRequestTarget=요청 타겟에서 유효하지 않은 문자가 발견되었습니다. 유효한 문자들은 RFC 7230과 RFC 
3986에 정의되어 있습니다.
 iib.invalidheader=HTTP 헤더 행 [{0}]이(가) RFC 7230을 준수하지 않아, 무시되었습니다.
 iib.invalidmethod=메소드 이름에 유효하지 않은 문자가 발견되었습니다. HTTP 메소드 이름은 유효한 토큰이어야 합니다.
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
index d49aa5d..472d947 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_ko.properties
@@ -15,6 +15,8 @@
 
 b2cConverter.unknownEncoding=문자 인코딩 [{0}]은(는) 지원되지 않습니다.
 
+encodedSolidusHandling.invalid=해당 값 [{0}]은(는) 인식되지 않습니다.
+
 uDecoder.convertHexDigit.notHex=[{0}]은(는) 16진수 숫자가 아닙니다.
 uDecoder.eof=파일의 끝 (EOF)
 uDecoder.noSlash=인코딩된 슬래시 문자는 허용되지 않습니다.


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

[tomcat] 02/06: Back-port updates to German translations

[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 d9759219406ddd43b40be267796d840cd7531bbf
Author: Mark Thomas 
AuthorDate: Mon May 4 17:52:24 2020 +0100

Back-port updates to German translations
---
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 44a1c29..d6891ca 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -24,7 +24,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
+jsp.error.file.not.found=Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
 jsp.error.invalid.tagdir=Tag Verzeichnis [{0}] beginnt nicht mit 
"/WEB-INF/tags"


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

[tomcat] 01/06: Backport updates to English strings

[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 ce0397c7788b4b6d17fea7f44adbeaf3b99ee090
Author: Mark Thomas 
AuthorDate: Mon May 4 17:52:12 2020 +0100

Backport updates to English strings
---
 java/org/apache/catalina/core/LocalStrings.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings.properties 
b/java/org/apache/catalina/core/LocalStrings.properties
index 8db3ce7..7798b9e 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -70,10 +70,10 @@ 
applicationServletRegistration.setServletSecurity.ise=Security constraints can''
 
 applicationSessionCookieConfig.ise=Property [{0}] cannot be added to 
SessionCookieConfig for context [{1}] as the context has been initialised
 
-aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
-aprListener.aprInit=The APR based Apache Tomcat Native library which allows 
optimal performance in production environments was not found on the 
java.library.path: [{0}]
-aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not 
be found using names [{0}] on the java.library.path [{1}]. The errors reported 
were [{2}]
-aprListener.aprInitError=The APR based Apache Tomcat Native library failed to 
load. The error reported was [{0}]
+aprListener.aprDestroy=Failed shutdown of the Apache Tomcat Native library
+aprListener.aprInit=The Apache Tomcat Native library which allows using 
OpenSSL was not found on the java.library.path: [{0}]
+aprListener.aprInitDebug=The Apache Tomcat Native library could not be found 
using names [{0}] on the java.library.path [{1}]. The errors reported were [{2}]
+aprListener.aprInitError=The Apache Tomcat Native library failed to load. The 
error reported was [{0}]
 aprListener.currentFIPSMode=Current FIPS mode: [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force 
entering FIPS mode, but library is already in FIPS mode [{0}]
 aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
@@ -84,9 +84,9 @@ aprListener.initializingFIPS=Initializing FIPS mode...
 aprListener.requireNotInFIPSMode=AprLifecycleListener is configured to require 
the library to already be in FIPS mode, but it was not in FIPS mode
 aprListener.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.
 aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnInvalid=An incompatible version [{0}] of the APR based Apache 
Tomcat Native library is installed, while Tomcat requires version [{1}]
-aprListener.tcnValid=Loaded APR based Apache Tomcat Native library [{0}] using 
APR version [{1}].
-aprListener.tcnVersion=An older version [{0}] of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends a minimum version of [{1}]
+aprListener.tcnInvalid=An incompatible version [{0}] of the Apache Tomcat 
Native library is installed, while Tomcat requires version [{1}]
+aprListener.tcnValid=Loaded Apache Tomcat Native library [{0}] using APR 
version [{1}].
+aprListener.tcnVersion=An older version [{0}] of the Apache Tomcat Native 
library is installed, while Tomcat recommends a minimum version of [{1}]
 aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been 
initialized
 aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been 
initialized
 aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already 
been initialized


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

[tomcat] 06/06: Backport updates to Chinese translations

[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 1b75434a8e0137107436d5deef8338a50437ad76
Author: Mark Thomas 
AuthorDate: Mon May 4 17:53:35 2020 +0100

Backport updates to Chinese translations
---
 java/javax/el/LocalStrings_zh_CN.properties|   1 +
 java/javax/servlet/LocalStrings_zh_CN.properties   |   1 +
 .../servlet/http/LocalStrings_zh_CN.properties |   2 +
 .../authenticator/LocalStrings_zh_CN.properties|  16 +++
 .../connector/LocalStrings_zh_CN.properties|  24 +
 .../catalina/core/LocalStrings_zh_CN.properties| 105 +-
 .../catalina/deploy/LocalStrings_zh_CN.properties  |   3 +
 .../catalina/filters/LocalStrings_zh_CN.properties |  19 
 .../ha/deploy/LocalStrings_zh_CN.properties|  19 
 .../ha/session/LocalStrings_zh_CN.properties   |  28 +
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  10 ++
 .../catalina/loader/LocalStrings_zh_CN.properties  |  20 
 .../catalina/manager/LocalStrings_zh_CN.properties |   3 +-
 .../manager/host/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |  35 ++
 .../security/LocalStrings_zh_CN.properties |   6 ++
 .../servlets/LocalStrings_zh_CN.properties |  19 
 .../catalina/session/LocalStrings_zh_CN.properties |  27 -
 .../catalina/startup/LocalStrings_zh_CN.properties |  59 +++---
 .../interceptors/LocalStrings_zh_CN.properties |   3 +
 .../tribes/tipis/LocalStrings_zh_CN.properties |   1 +
 .../tribes/util}/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/users/LocalStrings_zh_CN.properties   |   3 +
 .../catalina/util/LocalStrings_zh_CN.properties|  15 +++
 .../catalina/valves/LocalStrings_zh_CN.properties  |  39 +++
 .../apache/coyote/LocalStrings_zh_CN.properties|   5 +
 .../coyote/ajp/LocalStrings_zh_CN.properties   |   4 +
 .../coyote/http11/LocalStrings_zh_CN.properties|   8 ++
 .../http11/filters/LocalStrings_zh_CN.properties   |   2 +
 .../http11/upgrade/LocalStrings_zh_CN.properties   |   4 +
 .../jasper/resources/LocalStrings_zh_CN.properties | 119 +++--
 .../apache/naming/LocalStrings_zh_CN.properties|   5 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   7 ++
 .../webservices}/LocalStrings_zh_CN.properties |   2 +-
 .../tomcat/util/LocalStrings_zh_CN.properties  |   5 +
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |   5 +
 .../util/descriptor/LocalStrings_zh_CN.properties  |   5 +
 .../tomcat/util/http/LocalStrings_zh_CN.properties |   4 +
 .../util/http/parser/LocalStrings_zh_CN.properties |   3 +
 .../util/modeler/LocalStrings_zh_CN.properties |   1 +
 .../tomcat/util/scan/LocalStrings_zh_CN.properties |   2 +
 .../tomcat/websocket/LocalStrings_zh_CN.properties |  40 +++
 .../websocket/pojo/LocalStrings_zh_CN.properties   |  10 ++
 .../websocket/server/LocalStrings_zh_CN.properties |   6 ++
 .../WEB-INF/classes/LocalStrings_zh_CN.properties  |   3 +
 45 files changed, 673 insertions(+), 29 deletions(-)

diff --git a/java/javax/el/LocalStrings_zh_CN.properties 
b/java/javax/el/LocalStrings_zh_CN.properties
index 1803a07..b2b2585 100644
--- a/java/javax/el/LocalStrings_zh_CN.properties
+++ b/java/javax/el/LocalStrings_zh_CN.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 expressionFactory.cannotCreate=无法创建类型为[{0}]的表达式工厂
+expressionFactory.cannotFind=找不到类型为[{0}]的ExpressionFactory
 expressionFactory.readFailed=无法读取[{0}]
 
 objectNotAssignable=无法将类型为[{0}]的对象添加到[{1}]类型的对象数组中
diff --git a/java/javax/servlet/LocalStrings_zh_CN.properties 
b/java/javax/servlet/LocalStrings_zh_CN.properties
index 7fc4358..60310f3 100644
--- a/java/javax/servlet/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/LocalStrings_zh_CN.properties
@@ -19,4 +19,5 @@ httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
 
 httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
 
+value.false=否
 value.true=true
diff --git a/java/javax/servlet/http/LocalStrings_zh_CN.properties 
b/java/javax/servlet/http/LocalStrings_zh_CN.properties
index fbbd569..8a3b99e 100644
--- a/java/javax/servlet/http/LocalStrings_zh_CN.properties
+++ b/java/javax/servlet/http/LocalStrings_zh_CN.properties
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 err.cookie_name_blank=Cookie名称不能为null或零长度
+err.cookie_name_is_token=Cookie name[{0}]是一个保留令牌
+err.io.indexOutOfBounds=为大小为[{2}]的数组指定的偏移量[{0}]和/或长度[{1}]无效。
 err.io.nullArray=Null在write方法中传递给字节数组
 err.io.short_read=短.读
 
diff --git 
a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
index 69fd28a..0dc5906 100644
--- a/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/authenticator/LocalStrings_zh_CN.properties
@@ -15,6 +15,8 @@
 

[tomcat] branch 7.0.x updated (3a2e922 -> 1b75434)

[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 3a2e922  Add missing ALv2 headers
 new ce0397c  Backport updates to English strings
 new d975921  Back-port updates to German translations
 new 85e500c  Back-port updates to French translations
 new cc5d8e6  Back-port updates to Japanese translations
 new 5c1810a  Backport updates to Korean translations
 new 1b75434  Backport updates to Chinese translations

The 6 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/javax/el/LocalStrings_zh_CN.properties|   1 +
 java/javax/servlet/LocalStrings_zh_CN.properties   |   1 +
 .../servlet/http/LocalStrings_zh_CN.properties |   2 +
 .../authenticator/LocalStrings_ja.properties   |  32 ++--
 .../authenticator/LocalStrings_zh_CN.properties|  16 ++
 .../catalina/connector/LocalStrings_fr.properties  |   1 +
 .../catalina/connector/LocalStrings_ja.properties  |   5 +-
 .../catalina/connector/LocalStrings_ko.properties  |   1 +
 .../connector/LocalStrings_zh_CN.properties|  24 +++
 .../apache/catalina/core/LocalStrings.properties   |  14 +-
 .../catalina/core/LocalStrings_ja.properties   |  35 +++--
 .../catalina/core/LocalStrings_zh_CN.properties| 105 -
 .../catalina/deploy/LocalStrings_zh_CN.properties  |   3 +
 .../catalina/filters/LocalStrings_ja.properties|   6 +-
 .../catalina/filters/LocalStrings_zh_CN.properties |  19 +++
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  18 +--
 .../ha/deploy/LocalStrings_zh_CN.properties|  19 +++
 .../ha/session/LocalStrings_zh_CN.properties   |  28 
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  10 ++
 .../catalina/loader/LocalStrings_ja.properties |  10 +-
 .../catalina/loader/LocalStrings_zh_CN.properties  |  20 +++
 .../catalina/manager/LocalStrings_ja.properties|  15 +-
 .../catalina/manager/LocalStrings_zh_CN.properties |   3 +-
 .../manager/host/LocalStrings_ja.properties|   6 +-
 .../manager/host/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/realm/LocalStrings_ja.properties  |  11 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |  35 +
 .../catalina/security/LocalStrings_ja.properties   |   2 +-
 .../security/LocalStrings_zh_CN.properties |   6 +
 .../catalina/servlets/LocalStrings_ja.properties   |   6 +-
 .../servlets/LocalStrings_zh_CN.properties |  19 +++
 .../catalina/session/LocalStrings_ja.properties|  12 +-
 .../catalina/session/LocalStrings_ko.properties|   2 +
 .../catalina/session/LocalStrings_zh_CN.properties |  27 +++-
 .../catalina/startup/LocalStrings_ja.properties|  56 +++
 .../catalina/startup/LocalStrings_ko.properties|   1 +
 .../catalina/startup/LocalStrings_zh_CN.properties |  59 +--
 .../interceptors/LocalStrings_zh_CN.properties |   3 +
 .../tribes/tipis/LocalStrings_ja.properties|   2 +-
 .../tribes/tipis/LocalStrings_zh_CN.properties |   1 +
 .../LocalStrings_zh_CN.properties  |   2 +-
 .../catalina/users/LocalStrings_ja.properties  |   2 +-
 .../catalina/users/LocalStrings_zh_CN.properties   |   3 +
 .../catalina/util/LocalStrings_ja.properties   |   4 +-
 .../catalina/util/LocalStrings_zh_CN.properties|  15 ++
 .../catalina/valves/LocalStrings_ja.properties |  12 +-
 .../catalina/valves/LocalStrings_zh_CN.properties  |  39 +
 java/org/apache/coyote/LocalStrings_ja.properties  |   5 +-
 .../apache/coyote/LocalStrings_zh_CN.properties|   5 +
 .../apache/coyote/ajp/LocalStrings_ja.properties   |   2 +
 .../coyote/ajp/LocalStrings_zh_CN.properties   |   4 +
 .../coyote/http11/LocalStrings_ja.properties   |  24 +--
 .../coyote/http11/LocalStrings_ko.properties   |   1 +
 .../coyote/http11/LocalStrings_zh_CN.properties|   8 +
 .../http11/filters/LocalStrings_zh_CN.properties   |   2 +
 .../http11/upgrade/LocalStrings_zh_CN.properties   |   4 +
 .../jasper/resources/LocalStrings_de.properties|   2 +-
 .../jasper/resources/LocalStrings_fr.properties|  12 +-
 .../jasper/resources/LocalStrings_ja.properties| 175 +++--
 .../jasper/resources/LocalStrings_zh_CN.properties | 119 --
 java/org/apache/naming/LocalStrings_fr.properties  |   2 +-
 .../apache/naming/LocalStrings_zh_CN.properties|   5 +
 .../naming/factory/LocalStrings_ja.properties  |   4 +
 .../naming/factory/LocalStrings_zh_CN.properties   |   7 +
 .../webservices}/LocalStrings_zh_CN.properties |   2 +-
 .../tomcat/util/LocalStrings_zh_CN.properties  |   5 +
 .../tomcat/util/buf/LocalStrings_fr.properties |   2 +
 

[tomcat] 03/06: Back-port updates to French translations

[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 85e500ccd83495d20224f1db553049ab60cc8b47
Author: Mark Thomas 
AuthorDate: Mon May 4 17:52:40 2020 +0100

Back-port updates to French translations
---
 .../org/apache/catalina/connector/LocalStrings_fr.properties |  1 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties  | 12 
 java/org/apache/naming/LocalStrings_fr.properties|  2 +-
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   |  2 ++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index ee2310b..3d5ba85 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -25,6 +25,7 @@ coyoteAdapter.parsePathParam=Impossible de parser les 
paramètres du chemin en u
 
 coyoteConnector.cannotRegisterProtocol=Impossible d''enregistrer le MBean pour 
le Protocol
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la 
valeur spécifiée du port [{0}] n''est pas valide
+coyoteConnector.notAsciiSuperset=L''encodage [{0}] n''inclut pas l''ASCII 
comme requis par la RFC 7230, le connecteur va continuer à utiliser [{1}]
 coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE PEUT PAS contenir 
une entité (voir RFC 2616 Section 9.6)
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du 
gestionnaire de protocole a échoué
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index bb8681a..e59d0da 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -315,8 +315,7 @@ et où les options sont:\n\
 \-target  Fixe l'argument -target pour le compilateur (par 
défaut 1.6)\n\
 \-threadCount   Nombre de threads à utiliser pour la compilation\n\
 \  ("2.0C" veut dire deux threads par cœur)\n
-jspc.webfrg.footer=\n\
-\n\
+jspc.webfrg.footer=\n\
 \n
 jspc.webfrg.header=\n\
 http://java.sun.com/xml/ns/javaee"\n\
@@ -331,20 +330,17 @@ jspc.webfrg.header=\n\
 Crée automatiquement par JspC de Apache Tomcat.\n\
 -->\n\
 \n
-jspc.webinc.footer=\n\
-\n\
 \n
-jspc.webinc.header=\n\
-\n\
 \n
 jspc.webinc.insertEnd=
 jspc.webinc.insertStart=
-jspc.webxml.footer=\n\
-\n\
+jspc.webxml.footer=\n\
 \n
 jspc.webxml.header=\n\
 http://java.sun.com/xml/ns/javaee"\n\
diff --git a/java/org/apache/naming/LocalStrings_fr.properties 
b/java/org/apache/naming/LocalStrings_fr.properties
index 33dd57d..eb297c8 100644
--- a/java/org/apache/naming/LocalStrings_fr.properties
+++ b/java/org/apache/naming/LocalStrings_fr.properties
@@ -27,4 +27,4 @@ namingContext.readOnly=Le Contexte est en lecture seule
 
 selectorContext.methodUsingName=Appel de la méthode [{0}] avec le nom [{1}]
 selectorContext.methodUsingString=Appel de la méthode [{0}] avec la String 
[{1}]
-selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java:'
+selectorContext.noJavaUrl=Ce Contexte doit être accédé par une URL commençant 
par 'java :'
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
index 5abe4ec..f68a451 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_fr.properties
@@ -15,6 +15,8 @@
 
 b2cConverter.unknownEncoding=L''encodage de caractères [{0}] n''est pas 
supporté
 
+encodedSolidusHandling.invalid=La valeur [{0}] n''est pas reconnue
+
 uDecoder.convertHexDigit.notHex=[{0}] n''est pas un chiffre hexadécimal
 uDecoder.eof=Fin de fichier (EOF)
 uDecoder.noSlash=Un caractère slash encodé n'est pas autorisé


-
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

[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/218

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] 8e6a32e7f6d26c760750a4b5404725392274d871
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

[tomcat] branch 8.5.x updated (d7df70c -> 9d10586)

[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 d7df70c  Backport updates / additions to Chinese translations
 new 69801e6  Skip backport of keys known to be different
 new 9d10586  Additional keys that change between 7.0.x and 8.5.x

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:
 .../tomcat/buildutil/translate/BackportEnglish.java| 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)


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

[tomcat] 02/02: Additional keys that change between 7.0.x and 8.5.x

[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 9d10586adf581eb33b84192d550c0f1d38869d1f
Author: Mark Thomas 
AuthorDate: Mon May 4 17:50:52 2020 +0100

Additional keys that change between 7.0.x and 8.5.x
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index 023aa3f..fb43d84 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -36,7 +36,10 @@ public class BackportEnglish extends BackportBase {
 // Exclude keys known to be different between 9.0.x and 8.5.x
 
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
 
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
+
keysToExclude.add("java.org.apache.catalina.session.zzz.managerBase.contextNull");
 
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.error.jsproot.version.invalid");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jsp.tldCache.noTldInJar");
 keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");


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

[tomcat] 01/02: Skip backport of keys known to be different

[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 69801e6f17546911060f69076b4f2fdbc15bdd2e
Author: Mark Thomas 
AuthorDate: Mon May 4 17:10:16 2020 +0100

Skip backport of keys known to be different
---
 .../tomcat/buildutil/translate/BackportEnglish.java   | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index c6f9608..023aa3f 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -17,6 +17,8 @@
 package org.apache.tomcat.buildutil.translate;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Generates a set of English property files to back-port updates to a previous
@@ -27,7 +29,18 @@ import java.io.IOException;
  */
 public class BackportEnglish extends BackportBase {
 
+private static Set keysToExclude = new HashSet<>();
+
+
 public static void main(String... args) throws IOException {
+// Exclude keys known to be different between 9.0.x and 8.5.x
+
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
+
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
+
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
 BackportEnglish backport = new BackportEnglish(args);
 backport.execute();
 }
@@ -41,7 +54,7 @@ public class BackportEnglish extends BackportBase {
 @Override
 protected void execute() throws IOException {
 for (Object key : sourceEnglish.keySet()) {
-if (targetEnglish.containsKey(key)) {
+if (targetEnglish.containsKey(key) && 
!keysToExclude.contains(key)) {
 targetEnglish.put(key, sourceEnglish.get(key));
 }
 }


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

[tomcat] 03/04: Backport updates/additions to Korean translations

[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 6e439e310ebaeddbc454adf82e4423a04d5f41f9
Author: Mark Thomas 
AuthorDate: Mon May 4 17:31:42 2020 +0100

Backport updates/additions to Korean translations
---
 java/org/apache/catalina/connector/LocalStrings_ko.properties  | 1 +
 java/org/apache/catalina/manager/LocalStrings_ko.properties| 1 +
 java/org/apache/catalina/realm/LocalStrings_ko.properties  | 1 +
 java/org/apache/catalina/session/LocalStrings_ko.properties| 7 +++
 java/org/apache/catalina/startup/LocalStrings_ko.properties| 1 +
 java/org/apache/coyote/http11/LocalStrings_ko.properties   | 1 +
 java/org/apache/jasper/resources/LocalStrings_ko.properties| 1 +
 java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 9 files changed, 16 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties 
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index cb49fb7..2e13de3 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -81,6 +81,7 @@ request.asyncNotSupported=현재 체인의 필터 또는 서블릿이, 비동기
 request.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI fragment를 제거했습니다.
 request.illegalWrap=요청 wrapper는 반드시 getRequest()로부터 얻어진 요청을 wrap해야 합니다.
 request.notAsync=만일 현재의 쓰레드가 비동기 모드에 있지 않다면, 이 메소드를 호출하는 것은 불허됩니다. (즉, 
isAsyncStarted()가 false를 반환하는 경우)
+request.session.failed=다음 오류로 인해 세션 [{0}]을(를) 로드하지 못했습니다: [{1}]
 
 requestFacade.nullRequest=요청 객체가 이미 참조 해제 되었고, 더 이상 이 facade와 연관되지 않습니다.
 
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties 
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 965c44a..192daaf 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -148,6 +148,7 @@ managerServlet.resourcesType=OK - 타입이 [{0}]인 글로벌 리소스들의 
 managerServlet.saveFail=실패 - 설정을 저장하지 못했습니다: [{0}]
 managerServlet.saved=OK - 서버 설정이 저장되었습니다.
 managerServlet.savedContext=OK - 컨텍스트 [{0}]의 설정이 저장되었습니다.
+managerServlet.savedContextFail=실패 - Context [{0}] 설정을 저장하지 못했습니다.
 managerServlet.serverInfo=OK - 서버 정보\n\
 Tomcat 버전: [{0}]\n\
 운영체제 이름: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties 
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index e48df55..6fa71bd 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=사용자 [{0}]을(를) realm [{1}]을(를) 사용하
 combinedRealm.getPassword=getPassword() 메소드는 절대 호출되서는 안됩니다.
 combinedRealm.getPrincipal=getPrincipal() 메소드는 절대로 호출되서는 안됩니다.
 combinedRealm.realmStartFail=[{0}] realm을 시작하지 못했습니다.
+combinedRealm.setCredentialHandler=CredentialHandler가 해당 CombinedRealm (혹은 
CombinedRealm의 서브클래스) 객체에 설정 되었습니다만, CombinedRealm 클래스는 CredentialHandler를 사용하지 
않습니다. 설정 오류인가요?
 combinedRealm.unexpectedMethod=CombinedRealm의 메소드에 예기치 않은 호출이었습니다.
 
 credentialHandler.invalidStoredCredential=사용자가 제공한 credentials과 부합하는지 검사하기 
위하여, 유효하지 않은 저장된 credentials 문자열 [{0}]이(가), Realm에 의해 제공되었습니다.
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index e7fd6d1..42ed1fe 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -44,9 +44,14 @@ managerBase.setContextNotNew=만일 매니저가 NEW 상태에 있지 않다면,
 
 persistentManager.backupMaxIdle=세션 [{0}]을(를) 세션 저장소에 백업합니다. [{1}]초 동안 유휴 
상태였습니다.
 persistentManager.deserializeError=세션 [{0}]을(를) 역직렬화하는 중 오류 발생
+persistentManager.isLoadedError=세션 [{0}]이(가) 메모리에 로드되었는지 점검 중 오류 발생
 persistentManager.loading=[{0}]개의 저장된 세션들을 로드합니다.
+persistentManager.removeError=세션 [{0}]을(를) 저장소로부터 제거하는 중 오류 발생
 persistentManager.serializeError=세션을 직렬화하는 중 오류 발생 [{0}]: [{1}]
+persistentManager.storeClearError=저장소로부터 모든 세션들을 해제하는 중 오류 발생
 persistentManager.storeKeysException=세션 저장소에 있는 세션들의 ID 목록을 결정할 수 없습니다. 아마도 세션 
저장소가 비어 있는 것 같습니다.
+persistentManager.storeLoadError=저장소로부터 세션들을 메모리로 로드하는 중 오류 발생
+persistentManager.storeLoadKeysError=저장소로부터 세션 키들을 로드하는 중 오류 발생
 persistentManager.storeSizeException=세션 저장소에 얼마나 많은 세션이 존재하는지 알아낼 수 없습니다. 아마도 
세션 저장소가 비어 있는 것 같습니다.
 persistentManager.swapIn=저장소로부터 세션 [{0}]을(를) 다시 로드하여 활성화시킵니다.
 persistentManager.swapInException=저장소에 저장된 세션을 메모리로 로드하는 중, 저장소에서 예외 발생: [{0}]
@@ -79,6 +84,8 @@ standardSession.isNew.ise=isNew: 세션이 이미 무효화 되었습니다.
 standardSession.logoutfail=세션을 만료시킬 때, 사용자를 로그아웃 하는 중 예외 발생
 standardSession.notDeserializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 역직렬화할 수 없습니다.
 standardSession.notSerializable=세션 [{1}]을(를) 위한 세션 속성 

[tomcat] branch 8.5.x updated (cf861cb -> d7df70c)

[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 cf861cb  Fix indent
 new da503f3  Back-port updates/additions to French translations
 new 163c9a0  Backport updates / additions to Japanese translations
 new 6e439e3  Backport updates/additions to Korean translations
 new d7df70c  Backport updates / additions to Chinese translations

The 4 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/javax/el/LocalStrings_ja.properties   |   4 +-
 java/javax/el/LocalStrings_zh_CN.properties|   2 +
 java/javax/servlet/LocalStrings_zh_CN.properties   |   4 +-
 .../servlet/http/LocalStrings_zh_CN.properties |   2 +
 .../authenticator/LocalStrings_ja.properties   |  32 ++--
 .../authenticator/LocalStrings_zh_CN.properties|  16 ++
 .../jaspic/LocalStrings_ja.properties  |   6 +-
 .../jaspic/LocalStrings_zh_CN.properties   |   4 +
 .../catalina/connector/LocalStrings_fr.properties  |   1 +
 .../catalina/connector/LocalStrings_ja.properties  |   5 +-
 .../catalina/connector/LocalStrings_ko.properties  |   1 +
 .../connector/LocalStrings_zh_CN.properties|  30 
 .../catalina/core/LocalStrings_ja.properties   |  43 +++--
 .../catalina/core/LocalStrings_zh_CN.properties| 116 +
 .../catalina/deploy/LocalStrings_zh_CN.properties  |   3 +
 .../catalina/filters/LocalStrings_ja.properties|   6 +-
 .../catalina/filters/LocalStrings_zh_CN.properties |  19 +++
 .../ha/authenticator/LocalStrings_zh_CN.properties |   1 +
 .../ha/context/LocalStrings_zh_CN.properties   |   3 +
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  18 +-
 .../ha/deploy/LocalStrings_zh_CN.properties|  19 +++
 .../ha/session/LocalStrings_zh_CN.properties   |  32 +++-
 .../catalina/ha/tcp/LocalStrings_ja.properties |   2 +-
 .../catalina/ha/tcp/LocalStrings_zh_CN.properties  |  14 ++
 .../catalina/loader/LocalStrings_ja.properties |  10 +-
 .../catalina/loader/LocalStrings_zh_CN.properties  |  26 +++
 .../catalina/manager/LocalStrings_fr.properties|   1 +
 .../catalina/manager/LocalStrings_ja.properties|  20 ++-
 .../catalina/manager/LocalStrings_ko.properties|   1 +
 .../catalina/manager/LocalStrings_zh_CN.properties |   3 +-
 .../manager/host/LocalStrings_ja.properties|   6 +-
 .../manager/host/LocalStrings_zh_CN.properties |   2 +-
 .../catalina/mapper/LocalStrings_ja.properties |   2 +-
 .../catalina/mapper/LocalStrings_zh_CN.properties  |   8 +
 .../catalina/mbeans/LocalStrings_zh_CN.properties  |   2 +
 .../catalina/realm/LocalStrings_fr.properties  |   1 +
 .../catalina/realm/LocalStrings_ja.properties  |  12 +-
 .../catalina/realm/LocalStrings_ko.properties  |   1 +
 .../catalina/realm/LocalStrings_zh_CN.properties   |  41 +
 .../catalina/security/LocalStrings_ja.properties   |   2 +-
 .../security/LocalStrings_zh_CN.properties |   6 +
 .../catalina/servlets/LocalStrings_ja.properties   |   6 +-
 .../servlets/LocalStrings_zh_CN.properties |  21 +++
 .../catalina/session/LocalStrings_fr.properties|   5 +
 .../catalina/session/LocalStrings_ja.properties|  17 +-
 .../catalina/session/LocalStrings_ko.properties|   7 +
 .../catalina/session/LocalStrings_zh_CN.properties |  33 +++-
 .../catalina/startup/LocalStrings_ja.properties|  58 +++
 .../catalina/startup/LocalStrings_ko.properties|   1 +
 .../catalina/startup/LocalStrings_zh_CN.properties |  64 +--
 .../storeconfig/LocalStrings_ja.properties |   4 +-
 .../storeconfig/LocalStrings_zh_CN.properties  |   8 +
 .../tribes/group/LocalStrings_zh_CN.properties |   2 +
 .../group/interceptors/LocalStrings_ja.properties  |   6 +-
 .../interceptors/LocalStrings_zh_CN.properties |  41 +++--
 .../catalina/tribes/io/LocalStrings_ja.properties  |   2 +-
 .../tribes/io/LocalStrings_zh_CN.properties|   4 +
 .../tribes/jmx/LocalStrings_zh_CN.properties   |   3 +
 .../tribes/membership/LocalStrings_ja.properties   |   2 +-
 .../membership/LocalStrings_zh_CN.properties   |  11 ++
 .../tribes/tipis/LocalStrings_ja.properties|   4 +-
 .../tribes/tipis/LocalStrings_zh_CN.properties |  19 ++-
 .../tribes/transport/LocalStrings_ja.properties|   2 +-
 .../tribes/transport/LocalStrings_zh_CN.properties |   3 +
 .../transport/nio/LocalStrings_ja.properties   |   4 +-
 .../transport/nio/LocalStrings_zh_CN.properties|  11 ++
 .../tribes/util/LocalStrings_zh_CN.properties  |   5 +
 .../catalina/users/LocalStrings_ja.properties  |   4 +-
 .../catalina/users/LocalStrings_zh_CN.properties   |   3 +
 

[tomcat] branch 9.0.x updated: Another key not to backport

[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 9a2f34f  Another key not to backport
9a2f34f is described below

commit 9a2f34f3c211c948ca781326659a21852fd36250
Author: Mark Thomas 
AuthorDate: Mon May 4 17:28:08 2020 +0100

Another key not to backport
---
 java/org/apache/tomcat/buildutil/translate/BackportEnglish.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index c2c68d2..023aa3f 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -37,6 +37,7 @@ public class BackportEnglish extends BackportBase {
 
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
 
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
 
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.usage");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
 
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
 


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

[tomcat] 01/04: Back-port updates/additions to French translations

[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 da503f3e6e0d8f8fbd92c3d036c37ac5d957d66b
Author: Mark Thomas 
AuthorDate: Mon May 4 17:29:45 2020 +0100

Back-port updates/additions to French translations
---
 .../org/apache/catalina/connector/LocalStrings_fr.properties |  1 +
 java/org/apache/catalina/manager/LocalStrings_fr.properties  |  1 +
 java/org/apache/catalina/realm/LocalStrings_fr.properties|  1 +
 java/org/apache/catalina/session/LocalStrings_fr.properties  |  5 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties  | 12 
 java/org/apache/naming/LocalStrings_fr.properties|  2 +-
 java/org/apache/tomcat/util/buf/LocalStrings_fr.properties   |  2 ++
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_fr.properties 
b/java/org/apache/catalina/connector/LocalStrings_fr.properties
index 8f8ac8d..9430f27 100644
--- a/java/org/apache/catalina/connector/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_fr.properties
@@ -24,6 +24,7 @@ coyoteAdapter.nullRequest=Un dispatch asynchrone peut 
seulement se produire sur
 
 coyoteConnector.invalidEncoding=L''encodage [{0}] n''est pas reconnu par la 
JRE. Le connecteur (Connector) continuera à utiliser [{1}]
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la 
valeur spécifiée du port [{0}] n''est pas valide
+coyoteConnector.notAsciiSuperset=L''encodage [{0}] n''inclut pas l''ASCII 
comme requis par la RFC 7230, le connecteur va continuer à utiliser [{1}]
 coyoteConnector.parseBodyMethodNoTrace=La méthode "TRACE" NE PEUT PAS contenir 
une entité (voir RFC 2616 Section 9.6)
 coyoteConnector.protocolHandlerDestroyFailed=La destruction du gestionnaire de 
protocole a échoué
 coyoteConnector.protocolHandlerInitializationFailed=L'initialisation du 
gestionnaire de protocole a échoué
diff --git a/java/org/apache/catalina/manager/LocalStrings_fr.properties 
b/java/org/apache/catalina/manager/LocalStrings_fr.properties
index 2cbf355..4fbe336 100644
--- a/java/org/apache/catalina/manager/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_fr.properties
@@ -148,6 +148,7 @@ managerServlet.resourcesType=OK - Liste des ressources 
globales de type [{0}]
 managerServlet.saveFail=ECHEC - La sauvegarde de la configuration a échoué : 
[{0}]
 managerServlet.saved=OK - Configuration serveur sauvegardée
 managerServlet.savedContext=OK - Configuration du contexte [{0}] sauvegardée
+managerServlet.savedContextFail=ECHEC - L''enregistrement de la configuration 
du Contexte [{0}] a échoué
 managerServlet.serverInfo=OK - Informations sur le serveur\n\
 Version de Tomcat : [{0}]\n\
 Nom de l''OS : [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_fr.properties 
b/java/org/apache/catalina/realm/LocalStrings_fr.properties
index 32adafd..75fb113 100644
--- a/java/org/apache/catalina/realm/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_fr.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=Authentifié l''utilisateur [{0}] 
avec le domaine [{1}
 combinedRealm.getPassword=La méthode getPassword() ne doit jamais être appelée
 combinedRealm.getPrincipal=La méthode getPrincipal() ne devrait jamais être 
appelée
 combinedRealm.realmStartFail=Impossible de démarrer le royaume [{0}]
+combinedRealm.setCredentialHandler=Un CredentialHandler a été défini sur une 
instance de CombinedRealm (ou une sous classe de CombinedRealm), et 
CombinedRealm ne supporte pas de CredentialHandler
 combinedRealm.unexpectedMethod=Un appel de méthode inattendu à été effectué 
sur le royaumes combiné
 
 credentialHandler.invalidStoredCredential=Le royaume a fourni des identifiants 
[{0}] invalides à comparer avec ceux fournis par le client
diff --git a/java/org/apache/catalina/session/LocalStrings_fr.properties 
b/java/org/apache/catalina/session/LocalStrings_fr.properties
index f9f6932..b2fca5f 100644
--- a/java/org/apache/catalina/session/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/session/LocalStrings_fr.properties
@@ -44,9 +44,14 @@ managerBase.setContextNotNew=Il est illégal d'appeler 
setContext() pour changer
 
 persistentManager.backupMaxIdle=Sauvegarde de la session [{0}] vers le 
stockage (Store), en attente pour [{1}] secondes
 persistentManager.deserializeError=Erreur lors de la désérialisation de la 
session [{0}]
+persistentManager.isLoadedError=Erreur en vérifiant si la session [{0}] est 
chargée en mémoire
 persistentManager.loading=Chargement de [{0}] sessions persistantes
+persistentManager.removeError=Erreur en enlevant la session [{0}] du stockage
 persistentManager.serializeError=Erreur lors de la sérialisation de la session 
[{0}] : [{1}]
+persistentManager.storeClearError=Erreur en supprimant toutes les sessions du 
stockage

[tomcat] 02/02: Skip backport of keys known to be different

[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 62242ea24964e66159794bc14d17a3ea1a118ec7
Author: Mark Thomas 
AuthorDate: Mon May 4 17:10:16 2020 +0100

Skip backport of keys known to be different
---
 .../apache/tomcat/buildutil/translate/BackportEnglish.java | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index c6f9608..c2c68d2 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -17,6 +17,8 @@
 package org.apache.tomcat.buildutil.translate;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Generates a set of English property files to back-port updates to a previous
@@ -27,7 +29,17 @@ import java.io.IOException;
  */
 public class BackportEnglish extends BackportBase {
 
+private static Set keysToExclude = new HashSet<>();
+
+
 public static void main(String... args) throws IOException {
+// Exclude keys known to be different between 9.0.x and 8.5.x
+
keysToExclude.add("java.org.apache.catalina.manager.zzz.htmlManagerServlet.deployPath");
+
keysToExclude.add("java.org.apache.catalina.mbeans.zzz.jmxRemoteLifecycleListener.deprecated");
+
keysToExclude.add("java.org.apache.catalina.startup.zzz.catalina.stopServer.connectException");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webfrg.header");
+
keysToExclude.add("java.org.apache.jasper.resources.zzz.jspc.webxml.header");
+
 BackportEnglish backport = new BackportEnglish(args);
 backport.execute();
 }
@@ -41,7 +53,7 @@ public class BackportEnglish extends BackportBase {
 @Override
 protected void execute() throws IOException {
 for (Object key : sourceEnglish.keySet()) {
-if (targetEnglish.containsKey(key)) {
+if (targetEnglish.containsKey(key) && 
!keysToExclude.contains(key)) {
 targetEnglish.put(key, sourceEnglish.get(key));
 }
 }


-
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 (8e6a32e -> 62242ea)

[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 8e6a32e  Update changelog
 new 286ef34  Back-port updates to Korean translations
 new 62242ea  Skip backport of keys known to be different

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:
 .../apache/catalina/connector/LocalStrings_ko.properties   |  1 +
 .../org/apache/catalina/manager/LocalStrings_ko.properties |  1 +
 java/org/apache/catalina/realm/LocalStrings_ko.properties  |  1 +
 .../org/apache/catalina/session/LocalStrings_ko.properties |  2 ++
 .../org/apache/catalina/startup/LocalStrings_ko.properties |  1 +
 java/org/apache/coyote/http11/LocalStrings_ko.properties   |  1 +
 .../apache/tomcat/buildutil/translate/BackportEnglish.java | 14 +-
 java/org/apache/tomcat/util/buf/LocalStrings_ko.properties |  2 ++
 .../tomcat/util/net/openssl/LocalStrings_ko.properties |  1 +
 webapps/docs/changelog.xml |  4 
 10 files changed, 27 insertions(+), 1 deletion(-)


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

[tomcat] 01/02: Back-port updates to Korean translations

[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 286ef3423183e0f787d7fd58661a8ac75927d819
Author: Mark Thomas 
AuthorDate: Mon May 4 17:09:01 2020 +0100

Back-port updates to Korean translations
---
 java/org/apache/catalina/connector/LocalStrings_ko.properties  | 1 +
 java/org/apache/catalina/manager/LocalStrings_ko.properties| 1 +
 java/org/apache/catalina/realm/LocalStrings_ko.properties  | 1 +
 java/org/apache/catalina/session/LocalStrings_ko.properties| 2 ++
 java/org/apache/catalina/startup/LocalStrings_ko.properties| 1 +
 java/org/apache/coyote/http11/LocalStrings_ko.properties   | 1 +
 java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 webapps/docs/changelog.xml | 4 
 9 files changed, 14 insertions(+)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties 
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index 78e3676..d2df2d1 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -82,6 +82,7 @@ request.asyncNotSupported=현재 체인의 필터 또는 서블릿이, 비동기
 request.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI fragment를 제거했습니다.
 request.illegalWrap=요청 wrapper는 반드시 getRequest()로부터 얻어진 요청을 wrap해야 합니다.
 request.notAsync=만일 현재의 쓰레드가 비동기 모드에 있지 않다면, 이 메소드를 호출하는 것은 불허됩니다. (즉, 
isAsyncStarted()가 false를 반환하는 경우)
+request.session.failed=다음 오류로 인해 세션 [{0}]을(를) 로드하지 못했습니다: [{1}]
 
 requestFacade.nullRequest=요청 객체가 이미 참조 해제 되었고, 더 이상 이 facade와 연관되지 않습니다.
 
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties 
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 5903a59..98dc78d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -164,6 +164,7 @@ managerServlet.resourcesType=OK - 타입이 [{0}]인 글로벌 리소스들의 
 managerServlet.saveFail=실패 - 설정을 저장하지 못했습니다: [{0}]
 managerServlet.saved=OK - 서버 설정이 저장되었습니다.
 managerServlet.savedContext=OK - 컨텍스트 [{0}]의 설정이 저장되었습니다.
+managerServlet.savedContextFail=실패 - Context [{0}] 설정을 저장하지 못했습니다.
 managerServlet.serverInfo=OK - 서버 정보\n\
 Tomcat 버전: [{0}]\n\
 운영체제 이름: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties 
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index ecc1280..fb22c6c 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=사용자 [{0}]을(를) realm [{1}]을(를) 사용하
 combinedRealm.getPassword=getPassword() 메소드는 절대 호출되서는 안됩니다.
 combinedRealm.getPrincipal=getPrincipal() 메소드는 절대로 호출되서는 안됩니다.
 combinedRealm.realmStartFail=[{0}] realm을 시작하지 못했습니다.
+combinedRealm.setCredentialHandler=CredentialHandler가 해당 CombinedRealm (혹은 
CombinedRealm의 서브클래스) 객체에 설정 되었습니다만, CombinedRealm 클래스는 CredentialHandler를 사용하지 
않습니다. 설정 오류인가요?
 combinedRealm.unexpectedMethod=CombinedRealm의 메소드에 예기치 않은 호출이었습니다.
 
 credentialHandler.invalidStoredCredential=사용자가 제공한 credentials과 부합하는지 검사하기 
위하여, 유효하지 않은 저장된 credentials 문자열 [{0}]이(가), Realm에 의해 제공되었습니다.
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index c2a9b39..42ed1fe 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -84,6 +84,8 @@ standardSession.isNew.ise=isNew: 세션이 이미 무효화 되었습니다.
 standardSession.logoutfail=세션을 만료시킬 때, 사용자를 로그아웃 하는 중 예외 발생
 standardSession.notDeserializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 역직렬화할 수 없습니다.
 standardSession.notSerializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 직렬화할 수 없습니다.
+standardSession.principalNotDeserializable=세션 [{0}]을(를) 위한 Principal 객체를 역직렬화할 
수 없습니다.
+standardSession.principalNotSerializable=세션 [{0}]을(를) 위한 Principal 객체를 직렬화할 수 
없습니다.
 standardSession.removeAttribute.ise=removeAttribute: 세션이 이미 무효화되었습니다.
 standardSession.sessionEvent=세션 이벤트 리스너가 예외를 발생시켰습니다.
 standardSession.setAttribute.iae=setAttribute: 직렬화할 수 없는 속성 [{0}]
diff --git a/java/org/apache/catalina/startup/LocalStrings_ko.properties 
b/java/org/apache/catalina/startup/LocalStrings_ko.properties
index dc2368d..ddc1831 100644
--- a/java/org/apache/catalina/startup/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/startup/LocalStrings_ko.properties
@@ -149,6 +149,7 @@ tomcat.addWebapp.conflictChild=이미 존재하는 컨텍스트 [{2}](으)로 
 tomcat.addWebapp.conflictFile=이미 존재하는 파일 [{2}](으)로 인하여, [{0}]에 위치한 WAR를 컨텍스트 
경로 [{1}](으)로 배치할 수 없습니다.
 tomcat.baseDirMakeFail=Base 디렉토리로서 사용하기 위한, 디렉토리 [{0}]을(를) 생성할 수 없습니다.
 tomcat.baseDirNotDir=base 디렉토리를 위해 지정된 위치 [{0}]은(는) 디렉토리가 아닙니다.

[tomcat] 02/02: Fix indent

[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 cf861cbcb636cfcabc79f95390312374e986a91d
Author: Mark Thomas 
AuthorDate: Mon May 4 17:23:42 2020 +0100

Fix indent
---
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 7d1b61e..7526cfc 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -325,7 +325,7 @@ y donde  incluyen:\n\
 \-ieplugin  Java Plugin classid para Internet Explorer\n\
 \-classpath  Pasa por alto la propiedad de sistema 
java.class.path\n\
 \-xpoweredBy   Añade cabecera de respuesta  X-Powered-By\n\
-\-trimSpacesRemove template text that consists entirely of 
whitespace\n\
+\-trimSpaces   Remove template text that consists entirely of 
whitespace\n\
 \-javaEncodingSet the encoding charset for Java classes (default 
UTF-8)\n\
 \-source  Set the -source argument to the compiler (default 
1.7)\n\
 \-target  Set the -target argument to the compiler (default 
1.7)\n


-
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 (c82d864 -> cf861cb)

[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 c82d864  Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
 new 918a5a8  Fix earlier back-porting error
 new cf861cb  Fix indent

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/jasper/resources/LocalStrings.properties| 7 +++
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


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

[tomcat] 01/02: Fix earlier back-porting error

[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 918a5a812dfbc621c1a4201f5698419801984cd7
Author: Mark Thomas 
AuthorDate: Mon May 4 17:20:15 2020 +0100

Fix earlier back-porting error
---
 java/org/apache/jasper/resources/LocalStrings.properties | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 44ed90d..445b19b 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -348,11 +348,10 @@ where options include:\n\
 \-ieplugin  Java Plugin classid for Internet Explorer\n\
 \-classpath  Overrides java.class.path system property\n\
 \-xpoweredBy   Add X-Powered-By response header\n\
-\-trimSpaces [single]  Remove template text that consists entirely of 
whitespace\n\
-\  (if "single", replace such template text with a 
single space)\n\
+\-trimSpaces   Remove template text that consists entirely of 
whitespace\n\
 \-javaEncodingSet the encoding charset for Java classes (default 
UTF-8)\n\
-\-source  Set the -source argument to the compiler (default 
1.8)\n\
-\-target  Set the -target argument to the compiler (default 
1.8)\n\
+\-source  Set the -source argument to the compiler (default 
1.7)\n\
+\-target  Set the -target argument to the compiler (default 
1.7)\n\
 \-threadCount   Number of threads to use for compilation.\n\
 \  ("2.0C" means two threads per core)\n
 jspc.webfrg.footer=\n\


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

[tomcat] branch master updated: Skip backport of keys known to be different

[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 ca781b9  Skip backport of keys known to be different
ca781b9 is described below

commit ca781b943cff7d0a61820841145256db7d137d3b
Author: Mark Thomas 
AuthorDate: Mon May 4 17:10:16 2020 +0100

Skip backport of keys known to be different

This list will expand once the new schemas are available
---
 .../org/apache/tomcat/buildutil/translate/BackportEnglish.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java 
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
index c6f9608..739db0e 100644
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
@@ -17,6 +17,8 @@
 package org.apache.tomcat.buildutil.translate;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Generates a set of English property files to back-port updates to a previous
@@ -27,7 +29,13 @@ import java.io.IOException;
  */
 public class BackportEnglish extends BackportBase {
 
+private static Set keysToExclude = new HashSet<>();
+
+
 public static void main(String... args) throws IOException {
+// Exclude keys known to be different between 10.0.x and 9.0.x
+
keysToExclude.add("java.org.apache.catalina.connector.zzz.coyoteConnector.notAsciiSuperset");
+
 BackportEnglish backport = new BackportEnglish(args);
 backport.execute();
 }
@@ -41,7 +49,7 @@ public class BackportEnglish extends BackportBase {
 @Override
 protected void execute() throws IOException {
 for (Object key : sourceEnglish.keySet()) {
-if (targetEnglish.containsKey(key)) {
+if (targetEnglish.containsKey(key) && 
!keysToExclude.contains(key)) {
 targetEnglish.put(key, sourceEnglish.get(key));
 }
 }


-
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 (cae8992 -> c82d864)

[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 cae8992  Add missing ALv2 headers
 new 74c96b4  Backport updates to German translations
 new c82d864  Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x

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:
 .../jasper/resources/LocalStrings.properties   |  8 +++
 .../jasper/resources/LocalStrings_de.properties| 26 +-
 2 files changed, 29 insertions(+), 5 deletions(-)


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

[tomcat] 02/02: Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x

[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 c82d8641786caccf4d968a2be17665c221e18861
Author: Mark Thomas 
AuthorDate: Mon May 4 16:52:12 2020 +0100

Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
---
 java/org/apache/jasper/resources/LocalStrings.properties| 8 
 java/org/apache/jasper/resources/LocalStrings_de.properties | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index edd2477..44ed90d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -362,8 +362,8 @@ jspc.webfrg.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
 \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
 \  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\  version="4.0"\n\
+\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"\n\
+\  version="3.1"\n\
 \  metadata-complete="true">\n\
 \  org_apache_jasper.jspc\n\
 \  \n\
@@ -390,8 +390,8 @@ jspc.webxml.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
 \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
 \ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\n\
+\ version="3.1"\n\
 \ metadata-complete="false">\n\
 

[tomcat] 01/02: Backport updates to German translations

[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 74c96b49dfe4159e3304ba96bd8502f3914fb6f8
Author: Mark Thomas 
AuthorDate: Mon May 4 16:42:30 2020 +0100

Backport updates to German translations
---
 .../jasper/resources/LocalStrings_de.properties| 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index 561324d..4ea6cbf 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -24,7 +24,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
+jsp.error.file.not.found=Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]
 jsp.error.invalid.tagdir=Tag Verzeichnis [{0}] beginnt nicht mit 
"/WEB-INF/tags"
@@ -64,6 +64,19 @@ jsp.warning.unknown.targetVM=Unbekannte Ziel-VM [{0}] 
ignoriert
 jspc.webfrg.footer=\n\
 \n\
 \n
+jspc.webfrg.header=\n\
+http://xmlns.jcp.org/xml/ns/javaee"\n\
+\  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
+\  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
+\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
+\  version="4.0"\n\
+\  metadata-complete="true">\n\
+\  org_apache_jasper.jspc\n\
+\  \n\
+\n\
+\n
 jspc.webinc.header=\n\
 \n\
+\n
 
 org.apache.jasper.compiler.TldCache.servletContextNull=Der angegebene 
ServletContext war null


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

[tomcat] 03/04: Correct previous back-port of Chinese translations

[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 e6c61f4b086764f50cb12673511a7c96fcac459d
Author: Mark Thomas 
AuthorDate: Mon May 4 16:38:22 2020 +0100

Correct previous back-port of Chinese translations
---
 .../apache/catalina/manager/LocalStrings_zh_CN.properties|  1 -
 java/org/apache/catalina/realm/LocalStrings_zh_CN.properties |  1 -
 .../apache/jasper/resources/LocalStrings_zh_CN.properties| 12 
 .../org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties |  2 --
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 4969790..5258288 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -163,7 +163,6 @@ managerServlet.resourcesType=OK - [{0}]类型全局资源列入清单
 managerServlet.saveFail=失败 - 配置保存失败：[{0}]
 managerServlet.saved=OK - 服务器配置已保存
 managerServlet.savedContext=OK - 上下文[{0}]配置已保存
-managerServlet.savedContextFail=
 managerServlet.serverInfo=OK - 服务器信息\n\
 Tomcat版本: [{0}]\n\
 操作系统名称: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties 
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index be93cce..eabfb55 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -20,7 +20,6 @@ combinedRealm.authSuccess=认证用户[{0}]，权限[{1}]
 combinedRealm.getPassword=永远不应该调用getPassword（）方法
 combinedRealm.getPrincipal=方法getPrincipal()永远不应该被调用
 combinedRealm.realmStartFail=无法启动[{0}]领域
-combinedRealm.setCredentialHandler=
 combinedRealm.unexpectedMethod=对组合域上的方法进行了意外调用
 
 credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字符串[{0}]，以便与用户提供的凭据匹配
diff --git a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties 
b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
index 906955c..054cfe4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_zh_CN.properties
@@ -353,8 +353,7 @@ jsp.文件在哪\n\
 \-threadCount   编译使用的线程数.\n\
 \  ("2.0C" 意味着每个内核有两个线程)\n
 jspc.warning.tldInWebInfLib=TLD文件不应放在/WEB-INF/lib中”
-jspc.webfrg.footer=\n\
-\n\
+jspc.webfrg.footer=\n\
 \n
 jspc.webfrg.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
@@ -369,20 +368,17 @@ jspc.webfrg.header=\n\
 由 Apache Tomcat JspC 自动生成。\n\
 -->\n\
 \n
-jspc.webinc.footer=\n\
-\n\
 \n
-jspc.webinc.header=\n\
-\n\
 \n
 jspc.webinc.insertEnd=
 jspc.webinc.insertStart=
-jspc.webxml.footer=\n\
-\n\
+jspc.webxml.footer=\n\
 \n
 jspc.webxml.header=\n\
 http://xmlns.jcp.org/xml/ns/javaee"\n\
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties 
b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
index ede140a..1a61c77 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings_zh_CN.properties
@@ -22,8 +22,6 @@ byteBufferUtils.cleaner=无法使用直接ByteBuffer清洁剂，可能会发生
 
 chunk.overflow=缓冲区溢出且未设置接收器，请限制[{0}]和缓冲区长度[{1}]
 
-encodedSolidusHandling.invalid=
-
 hexUtils.fromHex.nonHex=输入只能由十六进制数字组成
 hexUtils.fromHex.oddDigits=输入必须由偶数个十六进制数字组成
 


-
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 (eb41338 -> 8e6a32e)

[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 eb41338  Add missing ALv2 headers
 new a2970bf  Back-port updates to German translations
 new 8110319  Back-port updates to Japanese translations
 new e6c61f4  Correct previous back-port of Chinese translations
 new 8e6a32e  Update changelog

The 4 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/javax/el/LocalStrings_ja.properties   |   4 +-
 .../authenticator/LocalStrings_ja.properties   |  32 +--
 .../jaspic/LocalStrings_ja.properties  |   6 +-
 .../catalina/connector/LocalStrings_ja.properties  |   5 +-
 .../catalina/core/LocalStrings_ja.properties   |  71 ---
 .../catalina/filters/LocalStrings_ja.properties|   6 +-
 .../catalina/ha/backend/LocalStrings_ja.properties |   2 +-
 .../catalina/ha/deploy/LocalStrings_ja.properties  |  22 +--
 .../catalina/ha/tcp/LocalStrings_ja.properties |   2 +-
 .../catalina/loader/LocalStrings_ja.properties |  14 +-
 .../catalina/manager/LocalStrings_ja.properties|  42 ++--
 .../catalina/manager/LocalStrings_zh_CN.properties |   1 -
 .../manager/host/LocalStrings_ja.properties|   6 +-
 .../catalina/mapper/LocalStrings_ja.properties |   2 +-
 .../catalina/mbeans/LocalStrings_ja.properties |  22 +--
 .../catalina/realm/LocalStrings_ja.properties  |  16 +-
 .../catalina/realm/LocalStrings_zh_CN.properties   |   1 -
 .../catalina/security/LocalStrings_ja.properties   |   2 +-
 .../catalina/servlets/LocalStrings_ja.properties   |   6 +-
 .../catalina/session/LocalStrings_ja.properties|  22 ++-
 .../catalina/startup/LocalStrings_ja.properties|  66 ---
 .../storeconfig/LocalStrings_ja.properties |   8 +-
 .../group/interceptors/LocalStrings_ja.properties  |   6 +-
 .../catalina/tribes/io/LocalStrings_ja.properties  |   2 +-
 .../tribes/membership/LocalStrings_ja.properties   |   2 +-
 .../membership/cloud/LocalStrings_ja.properties|   6 +-
 .../tribes/tipis/LocalStrings_ja.properties|   4 +-
 .../tribes/transport/LocalStrings_ja.properties|   2 +-
 .../transport/nio/LocalStrings_ja.properties   |   6 +-
 .../catalina/users/LocalStrings_ja.properties  |   4 +-
 .../catalina/util/LocalStrings_ja.properties   |   4 +-
 .../catalina/valves/LocalStrings_ja.properties |  14 +-
 .../valves/rewrite/LocalStrings_ja.properties  |   2 +-
 .../webresources/LocalStrings_ja.properties|   2 +
 java/org/apache/coyote/LocalStrings_ja.properties  |  18 +-
 .../apache/coyote/ajp/LocalStrings_ja.properties   |   1 +
 .../coyote/http11/LocalStrings_ja.properties   |  24 ++-
 .../http11/upgrade/LocalStrings_ja.properties  |  12 +-
 .../apache/coyote/http2/LocalStrings_ja.properties |  24 ++-
 .../jasper/resources/LocalStrings_de.properties|   2 +-
 .../jasper/resources/LocalStrings_ja.properties| 219 -
 .../jasper/resources/LocalStrings_zh_CN.properties |  12 +-
 .../naming/factory/LocalStrings_ja.properties  |   4 +
 .../apache/tomcat/util/LocalStrings_ja.properties  |   6 +-
 .../tomcat/util/buf/LocalStrings_ja.properties |   7 +-
 .../tomcat/util/buf/LocalStrings_zh_CN.properties  |   2 -
 .../tomcat/util/compat/LocalStrings_ja.properties  |   6 +-
 .../util/descriptor/LocalStrings_ja.properties |   2 +-
 .../util/descriptor/web/LocalStrings_ja.properties |  32 +--
 .../util/digester/LocalStrings_ja.properties   |  12 +-
 .../tomcat/util/http/LocalStrings_ja.properties|   8 +-
 .../util/http/parser/LocalStrings_ja.properties|   2 +-
 .../tomcat/util/modeler/LocalStrings_ja.properties |  13 +-
 .../tomcat/util/net/LocalStrings_ja.properties |  32 +--
 .../util/net/jsse/LocalStrings_ja.properties   |   7 +-
 .../util/net/openssl/LocalStrings_ja.properties|   5 +-
 .../tomcat/websocket/LocalStrings_ja.properties|   7 +-
 .../websocket/server/LocalStrings_ja.properties|   2 +-
 webapps/docs/changelog.xml |   4 +
 .../WEB-INF/classes/LocalStrings_ja.properties |   2 +-
 60 files changed, 495 insertions(+), 382 deletions(-)


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

[tomcat] 01/04: Back-port updates to German translations

[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 a2970bf0a762fb6d22f6cd77408af2058c97e913
Author: Mark Thomas 
AuthorDate: Mon May 4 16:37:03 2020 +0100

Back-port updates to German translations
---
 java/org/apache/jasper/resources/LocalStrings_de.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_de.properties 
b/java/org/apache/jasper/resources/LocalStrings_de.properties
index bc7f582..591e5e9 100644
--- a/java/org/apache/jasper/resources/LocalStrings_de.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_de.properties
@@ -28,7 +28,7 @@ jsp.error.compiler=Keine Java-Compiler verfügbar
 jsp.error.data.file.processing=Fehler beim Verarbeiten der Datei [{0}]
 jsp.error.el.template.deferred=#{...} is im Template Text nicht erlaubt
 jsp.error.fallback.invalidUse=jsp:fallback muss ein direktes Kind von 
jsp:plugin sein
-jsp.error.file.not.found=JSP-Datei [{0}] nicht gefunden
+jsp.error.file.not.found=Datei [{0}] nicht gefunden
 jsp.error.internal.filenotfound=Interner Fehler: Datei [{0}] nicht gefunden
 jsp.error.internal.unexpectedNodeType=Unerwarteter Knotentyp
 jsp.error.invalid.attribute=[{0}] hat ein ungültiges Attribut: [{1}]


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

[tomcat] 04/04: Update changelog

[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 8e6a32e7f6d26c760750a4b5404725392274d871
Author: Mark Thomas 
AuthorDate: Mon May 4 16:39:43 2020 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a077ee8..0358fe4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -198,6 +198,10 @@
 Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
 (markt)
   
+  
+Improve the quality of the Japanese translations provided with Apache
+Tomcat. Includes contributions from Yoshy. (markt)
+  
 
   
 


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

[tomcat] branch master updated: Improve coverage of Korean translations (woonsan)

[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 fbcafe2  Improve coverage of Korean translations (woonsan)
fbcafe2 is described below

commit fbcafe2512080b8e6acd06c1f426eb894db701cb
Author: Mark Thomas 
AuthorDate: Mon May 4 16:34:54 2020 +0100

Improve coverage of Korean translations (woonsan)
---
 java/org/apache/catalina/connector/LocalStrings_ko.properties  | 2 ++
 java/org/apache/catalina/manager/LocalStrings_ko.properties| 1 +
 java/org/apache/catalina/realm/LocalStrings_ko.properties  | 1 +
 java/org/apache/catalina/session/LocalStrings_ko.properties| 2 ++
 java/org/apache/catalina/startup/LocalStrings_ko.properties| 1 +
 java/org/apache/coyote/http11/LocalStrings_ko.properties   | 1 +
 java/org/apache/jasper/resources/LocalStrings_ko.properties| 4 
 java/org/apache/tomcat/util/buf/LocalStrings_ko.properties | 2 ++
 java/org/apache/tomcat/util/net/openssl/LocalStrings_ko.properties | 1 +
 webapps/docs/changelog.xml | 6 +-
 10 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/LocalStrings_ko.properties 
b/java/org/apache/catalina/connector/LocalStrings_ko.properties
index 78e3676..85b1b2d 100644
--- a/java/org/apache/catalina/connector/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/connector/LocalStrings_ko.properties
@@ -24,6 +24,7 @@ coyoteAdapter.nullRequest=비동기 디스패치는, 기존 요청에 대해 오
 
 coyoteConnector.invalidEncoding=인코딩 [{0}]은(는) JRE에 의해 인식되지 않습니다. Connector는 
[{1}]을(를) 계속 사용할 것입니다.
 coyoteConnector.invalidPort=지정된 포트 번호, [{0}]이(가) 유효하지 않기 때문에, Connector가 시작될 수 
없습니다.
+coyoteConnector.notAsciiSuperset=인코딩 [{0}]은(는), RFC 7230이 요구하는 ASCII의 상위집합이 
아닙니다. 해당 Connector는 [{1}]을(를) 계속 사용할 것입니다,
 coyoteConnector.parseBodyMethodNoTrace=TRACE 메소드는 엔티티를 포함해서는 안됩니다. (RFC 2616 
Section 9.6 참조)
 coyoteConnector.protocolHandlerDestroyFailed=프로토콜 핸들러 소멸 중 실패
 coyoteConnector.protocolHandlerInitializationFailed=프로토콜 핸들러 초기화가 실패했습니다.
@@ -82,6 +83,7 @@ request.asyncNotSupported=현재 체인의 필터 또는 서블릿이, 비동기
 request.fragmentInDispatchPath=디스패치 경로 [{0}](으)로부터 URI fragment를 제거했습니다.
 request.illegalWrap=요청 wrapper는 반드시 getRequest()로부터 얻어진 요청을 wrap해야 합니다.
 request.notAsync=만일 현재의 쓰레드가 비동기 모드에 있지 않다면, 이 메소드를 호출하는 것은 불허됩니다. (즉, 
isAsyncStarted()가 false를 반환하는 경우)
+request.session.failed=다음 오류로 인해 세션 [{0}]을(를) 로드하지 못했습니다: [{1}]
 
 requestFacade.nullRequest=요청 객체가 이미 참조 해제 되었고, 더 이상 이 facade와 연관되지 않습니다.
 
diff --git a/java/org/apache/catalina/manager/LocalStrings_ko.properties 
b/java/org/apache/catalina/manager/LocalStrings_ko.properties
index 5903a59..98dc78d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ko.properties
@@ -164,6 +164,7 @@ managerServlet.resourcesType=OK - 타입이 [{0}]인 글로벌 리소스들의 
 managerServlet.saveFail=실패 - 설정을 저장하지 못했습니다: [{0}]
 managerServlet.saved=OK - 서버 설정이 저장되었습니다.
 managerServlet.savedContext=OK - 컨텍스트 [{0}]의 설정이 저장되었습니다.
+managerServlet.savedContextFail=실패 - Context [{0}] 설정을 저장하지 못했습니다.
 managerServlet.serverInfo=OK - 서버 정보\n\
 Tomcat 버전: [{0}]\n\
 운영체제 이름: [{1}]\n\
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties 
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index b318448..a3cfcc2 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -20,6 +20,7 @@ combinedRealm.authSuccess=사용자 [{0}]을(를) realm [{1}]을(를) 사용하
 combinedRealm.getPassword=getPassword() 메소드는 절대 호출되서는 안됩니다.
 combinedRealm.getPrincipal=getPrincipal() 메소드는 절대로 호출되서는 안됩니다.
 combinedRealm.realmStartFail=[{0}] realm을 시작하지 못했습니다.
+combinedRealm.setCredentialHandler=CredentialHandler가 해당 CombinedRealm (혹은 
CombinedRealm의 서브클래스) 객체에 설정 되었습니다만, CombinedRealm 클래스는 CredentialHandler를 사용하지 
않습니다. 설정 오류인가요?
 combinedRealm.unexpectedMethod=CombinedRealm의 메소드에 예기치 않은 호출이었습니다.
 
 credentialHandler.invalidStoredCredential=사용자가 제공한 credentials과 부합하는지 검사하기 
위하여, 유효하지 않은 저장된 credentials 문자열 [{0}]이(가), Realm에 의해 제공되었습니다.
diff --git a/java/org/apache/catalina/session/LocalStrings_ko.properties 
b/java/org/apache/catalina/session/LocalStrings_ko.properties
index c2a9b39..42ed1fe 100644
--- a/java/org/apache/catalina/session/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/session/LocalStrings_ko.properties
@@ -84,6 +84,8 @@ standardSession.isNew.ise=isNew: 세션이 이미 무효화 되었습니다.
 standardSession.logoutfail=세션을 만료시킬 때, 사용자를 로그아웃 하는 중 예외 발생
 standardSession.notDeserializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 역직렬화할 수 없습니다.
 standardSession.notSerializable=세션 [{1}]을(를) 위한 세션 속성 [{0}]을(를) 직렬화할 수 없습니다.
+standardSession.principalNotDeserializable=세션 [{0}]을(를) 위한 Principal 객체를 역직렬화할 
수 없습니다.

[Bug 64394] Windows Installer should offer an option to trust the certs in the Windows truststore

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #7 from Mark Thomas  ---
You can see the updated text in the CI system:
https://ci.apache.org/projects/tomcat/tomcat9/docs/config/http.html#Key_store_types

-- 
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: Add missing ALv2 headers

[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 3a2e922  Add missing ALv2 headers
3a2e922 is described below

commit 3a2e922a0daf34e1a93d3c13adc5f79dc20239d5
Author: Mark Thomas 
AuthorDate: Mon May 4 16:03:02 2020 +0100

Add missing ALv2 headers

I'm expecting that IDEA will accept these files with a prolog and
comment header but if not, we can remove them and add them to the
excludes list for checking.
---
 res/ide-support/idea/ant.xml| 16 
 res/ide-support/idea/codeStyles/Project.xml | 17 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml | 17 +
 res/ide-support/idea/copyright/Tomcat.xml   | 17 +
 res/ide-support/idea/copyright/profiles_settings.xml| 17 +
 res/ide-support/idea/externalDependencies.xml   | 16 
 .../idea/inspectionProfiles/Project_Default.xml | 17 +
 7 files changed, 117 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
index a2a4769..ac834d1 100644
--- a/res/ide-support/idea/ant.xml
+++ b/res/ide-support/idea/ant.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
index 54fe072..adf710b 100644
--- a/res/ide-support/idea/codeStyles/Project.xml
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
index 79ee123..c81df23 100644
--- a/res/ide-support/idea/codeStyles/codeStyleConfig.xml
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
index 2982350..d9e4548 100644
--- a/res/ide-support/idea/copyright/Tomcat.xml
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -1,3 +1,20 @@
+
+
 
   
 http://www.apac [...]
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
index 0970355..ebc13c1 100644
--- a/res/ide-support/idea/copyright/profiles_settings.xml
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
index eade272..11f0751 100644
--- a/res/ide-support/idea/externalDependencies.xml
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
index 38495a4..dd01fa3 100644
--- a/res/ide-support/idea/inspectionProfiles/Project_Default.xml
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -1,3 +1,20 @@
+
+
 
   
 


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

[tomcat] branch 8.5.x updated: Add missing ALv2 headers

[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 cae8992  Add missing ALv2 headers
cae8992 is described below

commit cae8992e59ba36cede12ce48b8b2c03547297390
Author: Mark Thomas 
AuthorDate: Mon May 4 16:03:02 2020 +0100

Add missing ALv2 headers

I'm expecting that IDEA will accept these files with a prolog and
comment header but if not, we can remove them and add them to the
excludes list for checking.
---
 res/ide-support/idea/ant.xml| 16 
 res/ide-support/idea/codeStyles/Project.xml | 17 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml | 17 +
 res/ide-support/idea/copyright/Tomcat.xml   | 17 +
 res/ide-support/idea/copyright/profiles_settings.xml| 17 +
 res/ide-support/idea/externalDependencies.xml   | 16 
 .../idea/inspectionProfiles/Project_Default.xml | 17 +
 7 files changed, 117 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
index a2a4769..ac834d1 100644
--- a/res/ide-support/idea/ant.xml
+++ b/res/ide-support/idea/ant.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
index 54fe072..adf710b 100644
--- a/res/ide-support/idea/codeStyles/Project.xml
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
index 79ee123..c81df23 100644
--- a/res/ide-support/idea/codeStyles/codeStyleConfig.xml
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
index 2982350..d9e4548 100644
--- a/res/ide-support/idea/copyright/Tomcat.xml
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -1,3 +1,20 @@
+
+
 
   
 http://www.apac [...]
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
index 0970355..ebc13c1 100644
--- a/res/ide-support/idea/copyright/profiles_settings.xml
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
index eade272..11f0751 100644
--- a/res/ide-support/idea/externalDependencies.xml
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
index 38495a4..dd01fa3 100644
--- a/res/ide-support/idea/inspectionProfiles/Project_Default.xml
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -1,3 +1,20 @@
+
+
 
   
 


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

[tomcat] branch 9.0.x updated: Add missing ALv2 headers

[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 eb41338  Add missing ALv2 headers
eb41338 is described below

commit eb41338d318ac85f15b72b57494f6802023dcff0
Author: Mark Thomas 
AuthorDate: Mon May 4 16:03:02 2020 +0100

Add missing ALv2 headers

I'm expecting that IDEA will accept these files with a prolog and
comment header but if not, we can remove them and add them to the
excludes list for checking.
---
 res/ide-support/idea/ant.xml| 16 
 res/ide-support/idea/codeStyles/Project.xml | 17 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml | 17 +
 res/ide-support/idea/copyright/Tomcat.xml   | 17 +
 res/ide-support/idea/copyright/profiles_settings.xml| 17 +
 res/ide-support/idea/externalDependencies.xml   | 16 
 .../idea/inspectionProfiles/Project_Default.xml | 17 +
 7 files changed, 117 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
index a2a4769..ac834d1 100644
--- a/res/ide-support/idea/ant.xml
+++ b/res/ide-support/idea/ant.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
index 54fe072..adf710b 100644
--- a/res/ide-support/idea/codeStyles/Project.xml
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
index 79ee123..c81df23 100644
--- a/res/ide-support/idea/codeStyles/codeStyleConfig.xml
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
index 2982350..d9e4548 100644
--- a/res/ide-support/idea/copyright/Tomcat.xml
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -1,3 +1,20 @@
+
+
 
   
 http://www.apac [...]
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
index 0970355..ebc13c1 100644
--- a/res/ide-support/idea/copyright/profiles_settings.xml
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
index eade272..11f0751 100644
--- a/res/ide-support/idea/externalDependencies.xml
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
index 38495a4..dd01fa3 100644
--- a/res/ide-support/idea/inspectionProfiles/Project_Default.xml
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -1,3 +1,20 @@
+
+
 
   
 


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

[tomcat] branch master updated: Add missing ALv2 headers

[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 8825fa2  Add missing ALv2 headers
8825fa2 is described below

commit 8825fa20b19b4a979dee34a7b687b67813f69431
Author: Mark Thomas 
AuthorDate: Mon May 4 16:03:02 2020 +0100

Add missing ALv2 headers

I'm expecting that IDEA will accept these files with a prolog and
comment header but if not, we can remove them and add them to the
excludes list for checking.
---
 res/ide-support/idea/ant.xml| 16 
 res/ide-support/idea/codeStyles/Project.xml | 17 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml | 17 +
 res/ide-support/idea/copyright/Tomcat.xml   | 17 +
 res/ide-support/idea/copyright/profiles_settings.xml| 17 +
 res/ide-support/idea/externalDependencies.xml   | 16 
 .../idea/inspectionProfiles/Project_Default.xml | 17 +
 7 files changed, 117 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
index a2a4769..ac834d1 100644
--- a/res/ide-support/idea/ant.xml
+++ b/res/ide-support/idea/ant.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
index 54fe072..adf710b 100644
--- a/res/ide-support/idea/codeStyles/Project.xml
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
index 79ee123..c81df23 100644
--- a/res/ide-support/idea/codeStyles/codeStyleConfig.xml
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
index 2982350..d9e4548 100644
--- a/res/ide-support/idea/copyright/Tomcat.xml
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -1,3 +1,20 @@
+
+
 
   
 http://www.apac [...]
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
index 0970355..ebc13c1 100644
--- a/res/ide-support/idea/copyright/profiles_settings.xml
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -1,3 +1,20 @@
+
+
 
   
 
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
index eade272..11f0751 100644
--- a/res/ide-support/idea/externalDependencies.xml
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -1,4 +1,20 @@
 
+
 
   
 
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
index 38495a4..dd01fa3 100644
--- a/res/ide-support/idea/inspectionProfiles/Project_Default.xml
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -1,3 +1,20 @@
+
+
 
   
 


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

[tomcat] 01/04: Improve IDE support for IntelliJ IDEA

[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 e053bda5851df8ad377e64e9b6fc3f808cc40538
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:33:03 2020 +0200

Improve IDE support for IntelliJ IDEA

Move IntelliJ specific files to res/ide-support
---
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 4 files changed, 41 insertions(+)

diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
new file mode 100644
index 000..54fe072
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+
+  
+
+  
+  
+
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000..79ee123
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
new file mode 100644
index 000..eade272
--- /dev/null
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -0,0 +1,12 @@
+
+
+  
+
+
+
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000..38495a4
--- /dev/null
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+
+  
+
+
+  
+
+
+
+
+  
+
\ No newline at end of file


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

[tomcat] 04/04: Update changelog

[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 180c7318eee40a82e336f2974eefb8df797a1030
Author: Mark Thomas 
AuthorDate: Mon May 4 15:55:31 2020 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 748f246..b14142f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -233,6 +233,10 @@
 Refactor to use enhanced for loops where possible. Pull request by Lars
 Grefer. (markt)
   
+  
+Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+(markt)
+  
 
   
 


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

[tomcat] 03/04: Add ant configuration for IntelliJ IDEA

[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 10cefdbe2a9d0e6e5aea3702cf09069a523131d7
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:23:43 2020 +0200

Add ant configuration for IntelliJ IDEA
---
 res/ide-support/idea/ant.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
new file mode 100644
index 000..a2a4769
--- /dev/null
+++ b/res/ide-support/idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+  
+
+  
+
\ No newline at end of file


-
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 (02d11bb -> 180c731)

[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 02d11bb  Fix IDE warnings
 new e053bda  Improve IDE support for IntelliJ IDEA
 new 48ff017  Add copyright configuration for IntelliJ IDEA
 new 10cefdb  Add ant configuration for IntelliJ IDEA
 new 180c731  Update changelog

The 4 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:
 res/ide-support/idea/ant.xml|  6 ++
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/copyright/Tomcat.xml   |  6 ++
 res/ide-support/idea/copyright/profiles_settings.xml|  3 +++
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 webapps/docs/changelog.xml  |  4 
 8 files changed, 60 insertions(+)
 create mode 100644 res/ide-support/idea/ant.xml
 create mode 100644 res/ide-support/idea/codeStyles/Project.xml
 create mode 100644 res/ide-support/idea/codeStyles/codeStyleConfig.xml
 create mode 100644 res/ide-support/idea/copyright/Tomcat.xml
 create mode 100644 res/ide-support/idea/copyright/profiles_settings.xml
 create mode 100644 res/ide-support/idea/externalDependencies.xml
 create mode 100644 res/ide-support/idea/inspectionProfiles/Project_Default.xml


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

[tomcat] 02/04: Add copyright configuration for IntelliJ IDEA

[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 48ff01721d7674932d32c9b75b6d5ba312ee5d22
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:22:38 2020 +0200

Add copyright configuration for IntelliJ IDEA
---
 res/ide-support/idea/copyright/Tomcat.xml| 6 ++
 res/ide-support/idea/copyright/profiles_settings.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
new file mode 100644
index 000..2982350
--- /dev/null
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -0,0 +1,6 @@
+
+  
+http://www.apac [...]
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
new file mode 100644
index 000..0970355
--- /dev/null
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+  
+
\ No newline at end of file


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

[tomcat] 02/04: Add copyright configuration for IntelliJ IDEA

[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 33abc95d8989c11035b450f7792e0eaf90357357
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:22:38 2020 +0200

Add copyright configuration for IntelliJ IDEA
---
 res/ide-support/idea/copyright/Tomcat.xml| 6 ++
 res/ide-support/idea/copyright/profiles_settings.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
new file mode 100644
index 000..2982350
--- /dev/null
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -0,0 +1,6 @@
+
+  
+http://www.apac [...]
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
new file mode 100644
index 000..0970355
--- /dev/null
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+  
+
\ No newline at end of file


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

[tomcat] 03/04: Add ant configuration for IntelliJ IDEA

[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 e5f54bceb5bb3eb52ebf873364e3703510360dd6
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:23:43 2020 +0200

Add ant configuration for IntelliJ IDEA
---
 res/ide-support/idea/ant.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
new file mode 100644
index 000..a2a4769
--- /dev/null
+++ b/res/ide-support/idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+  
+
+  
+
\ No newline at end of file


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

[tomcat] 01/04: Improve IDE support for IntelliJ IDEA

[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 5f025de11e762f68f9aec3af9eccfc199fb86a6b
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:33:03 2020 +0200

Improve IDE support for IntelliJ IDEA

Move IntelliJ specific files to res/ide-support
---
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 4 files changed, 41 insertions(+)

diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
new file mode 100644
index 000..54fe072
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+
+  
+
+  
+  
+
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000..79ee123
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
new file mode 100644
index 000..eade272
--- /dev/null
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -0,0 +1,12 @@
+
+
+  
+
+
+
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000..38495a4
--- /dev/null
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+
+  
+
+
+  
+
+
+
+
+  
+
\ No newline at end of file


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

[tomcat] 04/04: Update changelog

[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 2d927a42465a935cbd9bf426c08ccd0096afdf78
Author: Mark Thomas 
AuthorDate: Mon May 4 15:55:31 2020 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4fd773e..a077ee8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,10 @@
 Refactor to use enhanced for loops where possible. Pull request by Lars
 Grefer. (markt)
   
+  
+Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+(markt)
+  
 
   
 


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

[tomcat] 01/04: Improve IDE support for IntelliJ IDEA

[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 0fdb892ebf07908c6285e175692dc715a79fca28
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:33:03 2020 +0200

Improve IDE support for IntelliJ IDEA

Move IntelliJ specific files to res/ide-support
---
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 4 files changed, 41 insertions(+)

diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
new file mode 100644
index 000..54fe072
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+
+  
+
+  
+  
+
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000..79ee123
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
new file mode 100644
index 000..eade272
--- /dev/null
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -0,0 +1,12 @@
+
+
+  
+
+
+
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000..38495a4
--- /dev/null
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+
+  
+
+
+  
+
+
+
+
+  
+
\ No newline at end of file


-
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 (c0c7990 -> 9f5ba20)

[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 c0c7990  Fix IDE warnings
 new 5f025de  Improve IDE support for IntelliJ IDEA
 new b813cee  Add copyright configuration for IntelliJ IDEA
 new 90b2118  Add ant configuration for IntelliJ IDEA
 new 9f5ba20  Update changelog

The 4 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:
 res/ide-support/idea/ant.xml|  6 ++
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/copyright/Tomcat.xml   |  6 ++
 res/ide-support/idea/copyright/profiles_settings.xml|  3 +++
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 webapps/docs/changelog.xml  |  4 
 8 files changed, 60 insertions(+)
 create mode 100644 res/ide-support/idea/ant.xml
 create mode 100644 res/ide-support/idea/codeStyles/Project.xml
 create mode 100644 res/ide-support/idea/codeStyles/codeStyleConfig.xml
 create mode 100644 res/ide-support/idea/copyright/Tomcat.xml
 create mode 100644 res/ide-support/idea/copyright/profiles_settings.xml
 create mode 100644 res/ide-support/idea/externalDependencies.xml
 create mode 100644 res/ide-support/idea/inspectionProfiles/Project_Default.xml


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

[tomcat] 02/04: Add copyright configuration for IntelliJ IDEA

[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 b813cee001fd41b08a9205241ace3920f164a349
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:22:38 2020 +0200

Add copyright configuration for IntelliJ IDEA
---
 res/ide-support/idea/copyright/Tomcat.xml| 6 ++
 res/ide-support/idea/copyright/profiles_settings.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
new file mode 100644
index 000..2982350
--- /dev/null
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -0,0 +1,6 @@
+
+  
+http://www.apac [...]
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
new file mode 100644
index 000..0970355
--- /dev/null
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+  
+
\ No newline at end of file


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

[tomcat] 04/04: Update changelog

[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 9f5ba20814b167fddb2259b44a86730e3756f8d5
Author: Mark Thomas 
AuthorDate: Mon May 4 15:55:31 2020 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4d153a6..0d4128d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,10 @@
 Refactor to use enhanced for loops where possible. Pull request by Lars
 Grefer. (markt)
   
+  
+Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+(markt)
+  
 
   
 


-
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 (e8c721a -> 2d927a4)

[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 e8c721a  Fix IDE warnings
 new 0fdb892  Improve IDE support for IntelliJ IDEA
 new 33abc95  Add copyright configuration for IntelliJ IDEA
 new e5f54bc  Add ant configuration for IntelliJ IDEA
 new 2d927a4  Update changelog

The 4 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:
 res/ide-support/idea/ant.xml|  6 ++
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/copyright/Tomcat.xml   |  6 ++
 res/ide-support/idea/copyright/profiles_settings.xml|  3 +++
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 webapps/docs/changelog.xml  |  4 
 8 files changed, 60 insertions(+)
 create mode 100644 res/ide-support/idea/ant.xml
 create mode 100644 res/ide-support/idea/codeStyles/Project.xml
 create mode 100644 res/ide-support/idea/codeStyles/codeStyleConfig.xml
 create mode 100644 res/ide-support/idea/copyright/Tomcat.xml
 create mode 100644 res/ide-support/idea/copyright/profiles_settings.xml
 create mode 100644 res/ide-support/idea/externalDependencies.xml
 create mode 100644 res/ide-support/idea/inspectionProfiles/Project_Default.xml


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

[tomcat] 03/04: Add ant configuration for IntelliJ IDEA

[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 90b211854fc3a1e41eec092994a75981b7d89746
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:23:43 2020 +0200

Add ant configuration for IntelliJ IDEA
---
 res/ide-support/idea/ant.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
new file mode 100644
index 000..a2a4769
--- /dev/null
+++ b/res/ide-support/idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+  
+
+  
+
\ No newline at end of file


-
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

[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 eab7fde  Update changelog
eab7fde is described below

commit eab7fdedb243fa5e9790f52e84f0a5e02e7ae814
Author: Mark Thomas 
AuthorDate: Mon May 4 15:55:31 2020 +0100

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6f1aebb..02d40b6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -230,6 +230,10 @@
 Refactor to use enhanced for loops where possible. Pull request by Lars
 Grefer. (markt)
   
+  
+Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+(markt)
+  
 
   
 


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

[tomcat] branch master updated (4efa2ec -> 14675f8)

[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 4efa2ec  Fix IDE warnings
 new ddadf5b  Improve IDE support for IntelliJ IDEA
 new fe225da  Add copyright configuration for IntelliJ IDEA
 new 14675f8  Add ant configuration for IntelliJ IDEA

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:
 res/ide-support/idea/ant.xml|  6 ++
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/copyright/Tomcat.xml   |  6 ++
 res/ide-support/idea/copyright/profiles_settings.xml|  3 +++
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 7 files changed, 56 insertions(+)
 create mode 100644 res/ide-support/idea/ant.xml
 create mode 100644 res/ide-support/idea/codeStyles/Project.xml
 create mode 100644 res/ide-support/idea/codeStyles/codeStyleConfig.xml
 create mode 100644 res/ide-support/idea/copyright/Tomcat.xml
 create mode 100644 res/ide-support/idea/copyright/profiles_settings.xml
 create mode 100644 res/ide-support/idea/externalDependencies.xml
 create mode 100644 res/ide-support/idea/inspectionProfiles/Project_Default.xml


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

[tomcat] 01/03: Improve IDE support for IntelliJ IDEA

[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 ddadf5b7ecd856fc309a5c70eb9f46286703740a
Author: Lars Grefer 
AuthorDate: Thu Apr 23 18:33:03 2020 +0200

Improve IDE support for IntelliJ IDEA

Move IntelliJ specific files to res/ide-support
---
 res/ide-support/idea/codeStyles/Project.xml | 13 +
 res/ide-support/idea/codeStyles/codeStyleConfig.xml |  5 +
 res/ide-support/idea/externalDependencies.xml   | 12 
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++
 4 files changed, 41 insertions(+)

diff --git a/res/ide-support/idea/codeStyles/Project.xml 
b/res/ide-support/idea/codeStyles/Project.xml
new file mode 100644
index 000..54fe072
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+
+  
+
+  
+  
+
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml 
b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000..79ee123
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+  
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml 
b/res/ide-support/idea/externalDependencies.xml
new file mode 100644
index 000..eade272
--- /dev/null
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -0,0 +1,12 @@
+
+
+  
+
+
+
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml 
b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000..38495a4
--- /dev/null
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+
+  
+
+
+  
+
+
+
+
+  
+
\ No newline at end of file


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

[tomcat] 02/03: Add copyright configuration for IntelliJ IDEA

[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 fe225da1ed99dd28407209358ce2052c85c09fa2
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:22:38 2020 +0200

Add copyright configuration for IntelliJ IDEA
---
 res/ide-support/idea/copyright/Tomcat.xml| 6 ++
 res/ide-support/idea/copyright/profiles_settings.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/res/ide-support/idea/copyright/Tomcat.xml 
b/res/ide-support/idea/copyright/Tomcat.xml
new file mode 100644
index 000..2982350
--- /dev/null
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -0,0 +1,6 @@
+
+  
+http://www.apac [...]
+
+  
+
\ No newline at end of file
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml 
b/res/ide-support/idea/copyright/profiles_settings.xml
new file mode 100644
index 000..0970355
--- /dev/null
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+  
+
\ No newline at end of file


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

[tomcat] 03/03: Add ant configuration for IntelliJ IDEA

[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 14675f87fe88e1bf9dd64dd789a1970466d47116
Author: Lars Grefer 
AuthorDate: Fri Apr 24 00:23:43 2020 +0200

Add ant configuration for IntelliJ IDEA
---
 res/ide-support/idea/ant.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
new file mode 100644
index 000..a2a4769
--- /dev/null
+++ b/res/ide-support/idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+  
+
+  
+
\ No newline at end of file


-
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 (6e6378d -> 02d11bb)

[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 6e6378d  Additional clean-up after enhanced for loop changes
 new aea5b94  Recycle in a consistent location
 new bb788e1  Avoid waste of resources due to reconstruction of objects
 new 02d11bb  Fix IDE warnings

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:
 .../apache/catalina/core/ApplicationContext.java   | 12 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  8 +++
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 5 files changed, 26 insertions(+), 24 deletions(-)


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

[tomcat] 03/03: Fix IDE warnings

[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 02d11bb82e9b00bb9fe8f61eb42f3ca9cca40272
Author: Mark Thomas 
AuthorDate: Mon May 4 15:50:10 2020 +0100

Fix IDE warnings
---
 java/org/apache/juli/ClassLoaderLogManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index aca6388..a1cda43 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
 return null;
 }
 
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
 String result = null;
 
 // If a prefix is defined look for a prefixed property first
@@ -587,13 +587,13 @@ public class ClassLoaderLogManager extends LogManager {
 }
 }
 try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
 Handler handler = (Handler) classLoader.loadClass(
 handlerClassName).getConstructor().newInstance();
 // The specification strongly implies all configuration 
should be done
 // during the creation of the handler object.
 // This includes setting level, filter, formatter and 
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
 info.handlers.put(handlerName, handler);
 if (rootHandlers == null) {
 localRootLogger.addHandler(handler);


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

[tomcat] 02/03: Avoid waste of resources due to reconstruction of objects

[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 bb788e126c9ba07e40b64ca78d92dd230c44552f
Author: KangZhiDong 
AuthorDate: Sat Apr 25 01:30:47 2020 +0800

Avoid waste of resources due to reconstruction of objects
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index a95998b..833c06e 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -190,7 +190,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * Thread local data used during request dispatch.
  */
-private final ThreadLocal dispatchData = new 
ThreadLocal();
+private static final ThreadLocal dispatchData = new 
ThreadLocal();
 
 
 /**
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 53ff3ea..c5abeac 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -92,7 +92,7 @@ public class ReplicationValve
 /**
  * crossContext session container
  */
-protected ThreadLocal> crossContextSessions =
+protected static ThreadLocal> crossContextSessions 
=
 new ThreadLocal>() ;
 
 /**
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index f4db615..a935e4b 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -199,7 +199,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * Session that is currently getting swapped in to prevent loading it more
  * than once concurrently
  */
-private final ThreadLocal sessionToSwapIn = new 
ThreadLocal();
+private static final ThreadLocal sessionToSwapIn = new 
ThreadLocal();
 
 
 // - Properties
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index b3e1b5f..aca6388 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -112,7 +112,7 @@ public class ClassLoaderLogManager extends LogManager {
  * This prefix is used to allow using prefixes for the properties names
  * of handlers and their subcomponents.
  */
-protected ThreadLocal prefix = new ThreadLocal();
+protected static ThreadLocal prefix = new ThreadLocal();
 
 
 /**
diff --git a/test/org/apache/catalina/valves/Benchmarks.java 
b/test/org/apache/catalina/valves/Benchmarks.java
index 882e7d6..2d0155f 100644
--- a/test/org/apache/catalina/valves/Benchmarks.java
+++ b/test/org/apache/catalina/valves/Benchmarks.java
@@ -76,14 +76,14 @@ public class Benchmarks {
 return "ThreadLocals";
 }
 
-private ThreadLocal currentMillisLocal = new ThreadLocal() 
{
+private static ThreadLocal currentMillisLocal = new 
ThreadLocal() {
 @Override
 protected Long initialValue() {
 return Long.valueOf(0);
 }
 };
 
-private ThreadLocal currentDateLocal = new ThreadLocal();
+private static ThreadLocal currentDateLocal = new 
ThreadLocal();
 
 @Override
 public void run() {
@@ -112,14 +112,14 @@ public class Benchmarks {
 long value = 0;
 }
 
-private ThreadLocal currentMillisLocal = new 
ThreadLocal() {
+private static ThreadLocal currentMillisLocal = new 
ThreadLocal() {
 @Override
 protected MutableLong initialValue() {
 return new MutableLong();
 }
 };
 
-private ThreadLocal currentDateLocal = new ThreadLocal();
+private static ThreadLocal currentDateLocal = new 
ThreadLocal();
 
 @Override
 public void run() {
@@ -149,7 +149,7 @@ public class Benchmarks {
 public Date currentDate;
 }
 
-private ThreadLocal currentStruct = new ThreadLocal() {
+private static ThreadLocal currentStruct = new 
ThreadLocal() {
 @Override
 protected Struct initialValue() {
 return new Struct();
@@ -266,33 +266,33 @@ public class Benchmarks {
 return "ThreadLocals";
 }
 
- 

[tomcat] 01/03: Recycle in a consistent location

[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 aea5b946be95c602b7a1812bc0798fc5e9c58dee
Author: Mark Thomas 
AuthorDate: Mon May 4 15:25:01 2020 +0100

Recycle in a consistent location
---
 java/org/apache/catalina/core/ApplicationContext.java | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 77f07a2..a95998b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -473,10 +473,8 @@ public class ApplicationContext implements ServletContext {
 dispatchData.set(dd);
 }
 
-MessageBytes uriMB = dd.uriMB;
-uriMB.recycle();
-
 // Use the thread local mapping data
+MessageBytes uriMB = dd.uriMB;
 MappingData mappingData = dd.mappingData;
 
 try {
@@ -505,7 +503,11 @@ public class ApplicationContext implements ServletContext {
 } finally {
 // Recycle thread local data at the end of the request so 
references
 // are not held to a completed request as there is potential for
-// that to trigger a memory leak if a context is unloaded.
+// that to trigger a memory leak if a context is unloaded. Not
+// strictly necessary here for uriMB but it needs to be recycled at
+// some point so do it here for consistency with mappingData which
+// must be recycled here.
+uriMB.recycle();
 mappingData.recycle();
 }
 }


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

buildbot success in on tomcat-9-trunk

[buildbot]

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

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] b8582f87abd347ea4c98998dbab32b884ef94177
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch 8.5.x updated: Fix IDE warnings

[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 c0c7990  Fix IDE warnings
c0c7990 is described below

commit c0c799061091c0e5eee71be47245b14024c3051b
Author: Mark Thomas 
AuthorDate: Mon May 4 15:50:10 2020 +0100

Fix IDE warnings
---
 java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
 java/org/apache/juli/ClassLoaderLogManager.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 0aa96de..efdb8ac 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -86,7 +86,7 @@ public class RewriteRule {
  * @return null if no rewrite took place
  */
 public CharSequence evaluate(CharSequence url, Resolver resolver) {
-Pattern pattern = this.pattern.get();
+Pattern pattern = RewriteRule.pattern.get();
 if (pattern == null) {
 // Parse the pattern
 int flags = 0;
@@ -94,7 +94,7 @@ public class RewriteRule {
 flags |= Pattern.CASE_INSENSITIVE;
 }
 pattern = Pattern.compile(patternString, flags);
-this.pattern.set(pattern);
+RewriteRule.pattern.set(pattern);
 }
 Matcher matcher = pattern.matcher(url);
 // Use XOR
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index cf3ad4c..c907056 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
 return null;
 }
 
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
 String result = null;
 
 // If a prefix is defined look for a prefixed property first
@@ -595,13 +595,13 @@ public class ClassLoaderLogManager extends LogManager {
 }
 }
 try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
 Handler handler = (Handler) classLoader.loadClass(
 handlerClassName).getConstructor().newInstance();
 // The specification strongly implies all configuration 
should be done
 // during the creation of the handler object.
 // This includes setting level, filter, formatter and 
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
 info.handlers.put(handlerName, handler);
 if (rootHandlers == null) {
 localRootLogger.addHandler(handler);


-
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: Fix IDE warnings

[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 e8c721a  Fix IDE warnings
e8c721a is described below

commit e8c721a121d75f8ace7e5975f00d9adde6035c18
Author: Mark Thomas 
AuthorDate: Mon May 4 15:50:10 2020 +0100

Fix IDE warnings
---
 java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
 java/org/apache/juli/ClassLoaderLogManager.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 0aa96de..efdb8ac 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -86,7 +86,7 @@ public class RewriteRule {
  * @return null if no rewrite took place
  */
 public CharSequence evaluate(CharSequence url, Resolver resolver) {
-Pattern pattern = this.pattern.get();
+Pattern pattern = RewriteRule.pattern.get();
 if (pattern == null) {
 // Parse the pattern
 int flags = 0;
@@ -94,7 +94,7 @@ public class RewriteRule {
 flags |= Pattern.CASE_INSENSITIVE;
 }
 pattern = Pattern.compile(patternString, flags);
-this.pattern.set(pattern);
+RewriteRule.pattern.set(pattern);
 }
 Matcher matcher = pattern.matcher(url);
 // Use XOR
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index cf3ad4c..c907056 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
 return null;
 }
 
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
 String result = null;
 
 // If a prefix is defined look for a prefixed property first
@@ -595,13 +595,13 @@ public class ClassLoaderLogManager extends LogManager {
 }
 }
 try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
 Handler handler = (Handler) classLoader.loadClass(
 handlerClassName).getConstructor().newInstance();
 // The specification strongly implies all configuration 
should be done
 // during the creation of the handler object.
 // This includes setting level, filter, formatter and 
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
 info.handlers.put(handlerName, handler);
 if (rootHandlers == null) {
 localRootLogger.addHandler(handler);


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

[tomcat] branch master updated: Fix IDE warnings

[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 4efa2ec  Fix IDE warnings
4efa2ec is described below

commit 4efa2eca68bb64996eac03ac139453d692621183
Author: Mark Thomas 
AuthorDate: Mon May 4 15:50:10 2020 +0100

Fix IDE warnings
---
 java/org/apache/catalina/valves/rewrite/RewriteRule.java | 4 ++--
 java/org/apache/juli/ClassLoaderLogManager.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 0aa96de..efdb8ac 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -86,7 +86,7 @@ public class RewriteRule {
  * @return null if no rewrite took place
  */
 public CharSequence evaluate(CharSequence url, Resolver resolver) {
-Pattern pattern = this.pattern.get();
+Pattern pattern = RewriteRule.pattern.get();
 if (pattern == null) {
 // Parse the pattern
 int flags = 0;
@@ -94,7 +94,7 @@ public class RewriteRule {
 flags |= Pattern.CASE_INSENSITIVE;
 }
 pattern = Pattern.compile(patternString, flags);
-this.pattern.set(pattern);
+RewriteRule.pattern.set(pattern);
 }
 Matcher matcher = pattern.matcher(url);
 // Use XOR
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java 
b/java/org/apache/juli/ClassLoaderLogManager.java
index cf3ad4c..c907056 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -277,7 +277,7 @@ public class ClassLoaderLogManager extends LogManager {
 return null;
 }
 
-String prefix = this.prefix.get();
+String prefix = ClassLoaderLogManager.prefix.get();
 String result = null;
 
 // If a prefix is defined look for a prefixed property first
@@ -595,13 +595,13 @@ public class ClassLoaderLogManager extends LogManager {
 }
 }
 try {
-this.prefix.set(prefix);
+ClassLoaderLogManager.prefix.set(prefix);
 Handler handler = (Handler) classLoader.loadClass(
 handlerClassName).getConstructor().newInstance();
 // The specification strongly implies all configuration 
should be done
 // during the creation of the handler object.
 // This includes setting level, filter, formatter and 
encoding.
-this.prefix.set(null);
+ClassLoaderLogManager.prefix.set(null);
 info.handlers.put(handlerName, handler);
 if (rootHandlers == null) {
 localRootLogger.addHandler(handler);


-
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 #285: Avoid waste of resources due to reconstruction of objects

[GitBox]

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


   Merged



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] 02/02: Avoid waste of resources due to reconstruction of objects

[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 2b628e8dc9acbab42ad8af068155f660a29c2d91
Author: KangZhiDong 
AuthorDate: Sat Apr 25 01:30:47 2020 +0800

Avoid waste of resources due to reconstruction of objects
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index b6cd374..90f32b2 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -186,7 +186,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * Thread local data used during request dispatch.
  */
-private final ThreadLocal dispatchData = new ThreadLocal<>();
+private static final ThreadLocal dispatchData = new 
ThreadLocal<>();
 
 
 /**
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 6eed956..666e29d 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -85,7 +85,7 @@ public class ReplicationValve
 /**
  * crossContext session container
  */
-protected final ThreadLocal> crossContextSessions =
+protected static final ThreadLocal> 
crossContextSessions =
 new ThreadLocal<>() ;
 
 /**
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 9f52c44..1fd08be 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -188,7 +188,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * Session that is currently getting swapped in to prevent loading it more
  * than once concurrently
  */
-private final ThreadLocal sessionToSwapIn = new ThreadLocal<>();
+private static final ThreadLocal sessionToSwapIn = new 
ThreadLocal<>();
 
 
 // - Properties
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java 
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c..a980d81 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -28,7 +28,7 @@ public class RewriteCond {
 
 public static class PatternCondition extends Condition {
 public Pattern pattern;
-private ThreadLocal matcher = new ThreadLocal<>();
+private static ThreadLocal matcher = new ThreadLocal<>();
 
 @Override
 public boolean evaluate(String value, Resolver resolver) {
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 833a12c..0aa96de 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -26,7 +26,7 @@ public class RewriteRule {
 
 protected RewriteCond[] conditions = new RewriteCond[0];
 
-protected ThreadLocal pattern = new ThreadLocal<>();
+protected static ThreadLocal pattern = new ThreadLocal<>();
 protected Substitution substitution = null;
 
 protected String patternString = null;
@@ -186,7 +186,7 @@ public class RewriteRule {
 protected boolean cookieSecure = false;
 protected boolean cookieHttpOnly = false;
 protected Substitution cookieSubstitution = null;
-protected ThreadLocal cookieResult = new ThreadLocal<>();
+protected static ThreadLocal cookieResult = new ThreadLocal<>();
 
 /**
  *  This forces a request attribute named VAR to be set to the value VAL,
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 78cbe7c..c44f798 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -79,7 +79,7 @@ public class RewriteValve extends ValveBase {
 /**
  * If rewriting occurs, the whole request will be processed again.
  */
-protected ThreadLocal invoked = new ThreadLocal<>();
+protected static ThreadLocal invoked = new 

[tomcat] 01/02: Recycle in a consistent location

[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 cef29461e812d07c465708fce54fd49c9bef4ea6
Author: Mark Thomas 
AuthorDate: Mon May 4 15:25:01 2020 +0100

Recycle in a consistent location
---
 java/org/apache/catalina/core/ApplicationContext.java | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 70c783d..b6cd374 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -454,10 +454,8 @@ public class ApplicationContext implements ServletContext {
 dispatchData.set(dd);
 }
 
-MessageBytes uriMB = dd.uriMB;
-uriMB.recycle();
-
 // Use the thread local mapping data
+MessageBytes uriMB = dd.uriMB;
 MappingData mappingData = dd.mappingData;
 
 try {
@@ -487,7 +485,11 @@ public class ApplicationContext implements ServletContext {
 } finally {
 // Recycle thread local data at the end of the request so 
references
 // are not held to a completed request as there is potential for
-// that to trigger a memory leak if a context is unloaded.
+// that to trigger a memory leak if a context is unloaded. Not
+// strictly necessary here for uriMB but it needs to be recycled at
+// some point so do it here for consistency with mappingData which
+// must be recycled here.
+uriMB.recycle();
 mappingData.recycle();
 }
 }


-
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 (ec318b5 -> 2b628e8)

[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 ec318b5  Align with master & 9.0.x
 new cef2946  Recycle in a consistent location
 new 2b628e8  Avoid waste of resources due to reconstruction of objects

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:
 .../apache/catalina/core/ApplicationContext.java   | 12 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 27 insertions(+), 25 deletions(-)


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

[tomcat] 01/02: Recycle in a consistent location

[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 582c09fe29cf51c800988d5294016880bfba9b8a
Author: Mark Thomas 
AuthorDate: Mon May 4 15:25:01 2020 +0100

Recycle in a consistent location
---
 java/org/apache/catalina/core/ApplicationContext.java | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index cce739b..7e6eed6 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -454,10 +454,8 @@ public class ApplicationContext implements ServletContext {
 dispatchData.set(dd);
 }
 
-MessageBytes uriMB = dd.uriMB;
-uriMB.recycle();
-
 // Use the thread local mapping data
+MessageBytes uriMB = dd.uriMB;
 MappingData mappingData = dd.mappingData;
 
 try {
@@ -487,7 +485,11 @@ public class ApplicationContext implements ServletContext {
 } finally {
 // Recycle thread local data at the end of the request so 
references
 // are not held to a completed request as there is potential for
-// that to trigger a memory leak if a context is unloaded.
+// that to trigger a memory leak if a context is unloaded. Not
+// strictly necessary here for uriMB but it needs to be recycled at
+// some point so do it here for consistency with mappingData which
+// must be recycled here.
+uriMB.recycle();
 mappingData.recycle();
 }
 }


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

[tomcat] 02/02: Avoid waste of resources due to reconstruction of objects

[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 c4b71e31f3183ce3f4b8e86bd2cef49393a2a7e5
Author: KangZhiDong 
AuthorDate: Sat Apr 25 01:30:47 2020 +0800

Avoid waste of resources due to reconstruction of objects
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 7e6eed6..1e29076 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -186,7 +186,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * Thread local data used during request dispatch.
  */
-private final ThreadLocal dispatchData = new ThreadLocal<>();
+private static final ThreadLocal dispatchData = new 
ThreadLocal<>();
 
 
 /**
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 6eed956..666e29d 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -85,7 +85,7 @@ public class ReplicationValve
 /**
  * crossContext session container
  */
-protected final ThreadLocal> crossContextSessions =
+protected static final ThreadLocal> 
crossContextSessions =
 new ThreadLocal<>() ;
 
 /**
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 9f52c44..1fd08be 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -188,7 +188,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * Session that is currently getting swapped in to prevent loading it more
  * than once concurrently
  */
-private final ThreadLocal sessionToSwapIn = new ThreadLocal<>();
+private static final ThreadLocal sessionToSwapIn = new 
ThreadLocal<>();
 
 
 // - Properties
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java 
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c..a980d81 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -28,7 +28,7 @@ public class RewriteCond {
 
 public static class PatternCondition extends Condition {
 public Pattern pattern;
-private ThreadLocal matcher = new ThreadLocal<>();
+private static ThreadLocal matcher = new ThreadLocal<>();
 
 @Override
 public boolean evaluate(String value, Resolver resolver) {
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 833a12c..0aa96de 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -26,7 +26,7 @@ public class RewriteRule {
 
 protected RewriteCond[] conditions = new RewriteCond[0];
 
-protected ThreadLocal pattern = new ThreadLocal<>();
+protected static ThreadLocal pattern = new ThreadLocal<>();
 protected Substitution substitution = null;
 
 protected String patternString = null;
@@ -186,7 +186,7 @@ public class RewriteRule {
 protected boolean cookieSecure = false;
 protected boolean cookieHttpOnly = false;
 protected Substitution cookieSubstitution = null;
-protected ThreadLocal cookieResult = new ThreadLocal<>();
+protected static ThreadLocal cookieResult = new ThreadLocal<>();
 
 /**
  *  This forces a request attribute named VAR to be set to the value VAL,
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 70d204b..273fe80 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -77,7 +77,7 @@ public class RewriteValve extends ValveBase {
 /**
  * If rewriting occurs, the whole request will be processed again.
  */
-protected ThreadLocal invoked = new ThreadLocal<>();
+protected static ThreadLocal invoked = new 

[tomcat] branch 9.0.x updated (b8582f8 -> c4b71e3)

[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 b8582f8  Align with master & 8.5.x
 new 582c09f  Recycle in a consistent location
 new c4b71e3  Avoid waste of resources due to reconstruction of objects

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:
 .../apache/catalina/core/ApplicationContext.java   | 12 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 27 insertions(+), 25 deletions(-)


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

[tomcat] branch master updated (dabcbc1 -> 1719b71)

[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 dabcbc1  Align with 9.0.x & 8.5.x
 new 39f7d5b  Recycle in a consistent location
 new 1719b71  Avoid waste of resources due to reconstruction of objects

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:
 .../apache/catalina/core/ApplicationContext.java   | 12 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 27 insertions(+), 25 deletions(-)


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

[tomcat] 01/02: Recycle in a consistent location

[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 39f7d5bc47076a7723b14b26b99ee921ceb3c603
Author: Mark Thomas 
AuthorDate: Mon May 4 15:25:01 2020 +0100

Recycle in a consistent location
---
 java/org/apache/catalina/core/ApplicationContext.java | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index ce8e718..61981e5 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -439,10 +439,8 @@ public class ApplicationContext implements ServletContext {
 dispatchData.set(dd);
 }
 
-MessageBytes uriMB = dd.uriMB;
-uriMB.recycle();
-
 // Use the thread local mapping data
+MessageBytes uriMB = dd.uriMB;
 MappingData mappingData = dd.mappingData;
 
 try {
@@ -472,7 +470,11 @@ public class ApplicationContext implements ServletContext {
 } finally {
 // Recycle thread local data at the end of the request so 
references
 // are not held to a completed request as there is potential for
-// that to trigger a memory leak if a context is unloaded.
+// that to trigger a memory leak if a context is unloaded. Not
+// strictly necessary here for uriMB but it needs to be recycled at
+// some point so do it here for consistency with mappingData which
+// must be recycled here.
+uriMB.recycle();
 mappingData.recycle();
 }
 }


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

[tomcat] 02/02: Avoid waste of resources due to reconstruction of objects

[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 1719b71374d57d59bdcd99537bf13348cdaf87c7
Author: KangZhiDong 
AuthorDate: Sat Apr 25 01:30:47 2020 +0800

Avoid waste of resources due to reconstruction of objects
---
 .../apache/catalina/core/ApplicationContext.java   |  2 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |  2 +-
 .../catalina/session/PersistentManagerBase.java|  2 +-
 .../catalina/valves/rewrite/RewriteCond.java   |  2 +-
 .../catalina/valves/rewrite/RewriteRule.java   |  4 ++--
 .../catalina/valves/rewrite/RewriteValve.java  |  2 +-
 java/org/apache/juli/ClassLoaderLogManager.java|  2 +-
 test/org/apache/catalina/valves/Benchmarks.java| 26 +++---
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 61981e5..004055a 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -171,7 +171,7 @@ public class ApplicationContext implements ServletContext {
 /**
  * Thread local data used during request dispatch.
  */
-private final ThreadLocal dispatchData = new ThreadLocal<>();
+private static final ThreadLocal dispatchData = new 
ThreadLocal<>();
 
 
 /**
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 144dbbb..8cd73b9 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -85,7 +85,7 @@ public class ReplicationValve
 /**
  * crossContext session container
  */
-protected final ThreadLocal> crossContextSessions =
+protected static final ThreadLocal> 
crossContextSessions =
 new ThreadLocal<>() ;
 
 /**
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 9f52c44..1fd08be 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -188,7 +188,7 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * Session that is currently getting swapped in to prevent loading it more
  * than once concurrently
  */
-private final ThreadLocal sessionToSwapIn = new ThreadLocal<>();
+private static final ThreadLocal sessionToSwapIn = new 
ThreadLocal<>();
 
 
 // - Properties
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteCond.java 
b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
index 47a904c..a980d81 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteCond.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteCond.java
@@ -28,7 +28,7 @@ public class RewriteCond {
 
 public static class PatternCondition extends Condition {
 public Pattern pattern;
-private ThreadLocal matcher = new ThreadLocal<>();
+private static ThreadLocal matcher = new ThreadLocal<>();
 
 @Override
 public boolean evaluate(String value, Resolver resolver) {
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java 
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 833a12c..0aa96de 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -26,7 +26,7 @@ public class RewriteRule {
 
 protected RewriteCond[] conditions = new RewriteCond[0];
 
-protected ThreadLocal pattern = new ThreadLocal<>();
+protected static ThreadLocal pattern = new ThreadLocal<>();
 protected Substitution substitution = null;
 
 protected String patternString = null;
@@ -186,7 +186,7 @@ public class RewriteRule {
 protected boolean cookieSecure = false;
 protected boolean cookieHttpOnly = false;
 protected Substitution cookieSubstitution = null;
-protected ThreadLocal cookieResult = new ThreadLocal<>();
+protected static ThreadLocal cookieResult = new ThreadLocal<>();
 
 /**
  *  This forces a request attribute named VAR to be set to the value VAL,
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java 
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 20d8ba0..9025293 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -77,7 +77,7 @@ public class RewriteValve extends ValveBase {
 /**
  * If rewriting occurs, the whole request will be processed again.
  */
-protected ThreadLocal invoked = new ThreadLocal<>();
+protected static ThreadLocal invoked = new 

[GitHub] [tomcat] markt-asf commented on pull request #285: Avoid waste of resources due to reconstruction of objects

[GitBox]

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


   The only one I'm concerned about is `JspFactoryImpl` as this would open up 
the possibility of one web application being able to impact another. I'll merge 
this manually so I can skip that class.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] markt-asf commented on pull request #285: Avoid waste of resources due to reconstruction of objects

[GitBox]

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


   Re-opening, as I have done most of the analysis required.



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

[Bug 64409] Usage of TLS is insecure

[bugzilla]

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

--- Comment #4 from Christopher Schultz  ---
Yes, this is actually INVALID as it reports a bug that is not there, rather
than a bug that is there that we don't think is a bug.

Calling SSLContext.getInstance("TLSv1.3") won't make a bit of difference except
under very specific circumstances. For most environments, this would
immediately cause an exception to be thrown because TLSv1.3 isn't supported
until Java 11 which isn't yet widely-deployed.

However, there is room for improvement for TokenStreamProvider by allowing
customization of the TLS protocols and cipher suites. That would be an
enhancement request, though, IMO.

-- 
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 9.0.x updated: Align with master & 8.5.x

[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 b8582f8  Align with master & 8.5.x
b8582f8 is described below

commit b8582f87abd347ea4c98998dbab32b884ef94177
Author: Mark Thomas 
AuthorDate: Mon May 4 14:10:59 2020 +0100

Align with master & 8.5.x

Review of classes impacted by PR #285
---
 java/org/apache/catalina/session/PersistentManagerBase.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 97d8e29..9f52c44 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -308,9 +308,9 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  *
  * @param id The session id for the session to be searched for
  * @return {@code true}, if the session id is loaded in memory
- *  otherwise {@code false} is returned
+ * otherwise {@code false} is returned
  */
-public boolean isLoaded(String id){
+public boolean isLoaded(String id) {
 try {
 if (super.findSession(id) != null) {
 return true;


-
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: Align with master & 9.0.x

[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 ec318b5  Align with master & 9.0.x
ec318b5 is described below

commit ec318b5bbb865296b2c77ac34142d9423be4a03d
Author: Mark Thomas 
AuthorDate: Mon May 4 14:11:40 2020 +0100

Align with master & 9.0.x

Review of classes impacted by PR #285
---
 .../apache/catalina/core/ApplicationContext.java   |   4 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |   2 +-
 .../catalina/session/LocalStrings.properties   |   5 +
 .../catalina/session/PersistentManagerBase.java|  58 -
 .../valves/rewrite/QuotedStringTokenizer.java  | 135 +
 .../catalina/valves/rewrite/RewriteRule.java   |   2 +-
 .../catalina/valves/rewrite/RewriteValve.java  |   2 +-
 test/org/apache/catalina/valves/Benchmarks.java|   2 +-
 8 files changed, 172 insertions(+), 38 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index fab9fac..70c783d 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1010,7 +1010,7 @@ public class ApplicationContext implements ServletContext 
{
 Connector[] connectors = service.findConnectors();
 // Need at least one SSL enabled connector to use the SSL session ID.
 for (Connector connector : connectors) {
-if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
+if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
 supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
 break;
 }
@@ -1278,7 +1278,7 @@ public class ApplicationContext implements ServletContext 
{
 
 Container[] wrappers = context.findChildren();
 for (Container wrapper : wrappers) {
-result.put(((Wrapper) wrapper).getName(),
+result.put(wrapper.getName(),
 new ApplicationServletRegistration(
 (Wrapper) wrapper, context));
 }
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java 
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 9e91cfb..6eed956 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -318,7 +318,7 @@ public class ReplicationValve
 Context context = request.getContext();
 boolean isCrossContext = context != null
 && context instanceof StandardContext
-&& ((StandardContext) context).getCrossContext();
+&& context.getCrossContext();
 try {
 if(isCrossContext) {
 if(log.isDebugEnabled()) {
diff --git a/java/org/apache/catalina/session/LocalStrings.properties 
b/java/org/apache/catalina/session/LocalStrings.properties
index 289b272..62a8b49 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -44,9 +44,14 @@ managerBase.setContextNotNew=It is illegal to call 
setContext() to change the Co
 
 persistentManager.backupMaxIdle=Backing up session [{0}] to Store, idle for 
[{1}] seconds
 persistentManager.deserializeError=Error deserializing Session [{0}]
+persistentManager.isLoadedError=Error checking if session [{0}] is loaded in 
memory
 persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.removeError=Error removing session [{0}] from the store
 persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
+persistentManager.storeClearError=Error clearning all sessions from the store
 persistentManager.storeKeysException=Unable to determine the list of session 
IDs for sessions in the session store, assuming that the store is empty
+persistentManager.storeLoadError=Error swapping in sessions from the store
+persistentManager.storeLoadKeysError=Error loading sessions keys from the store
 persistentManager.storeSizeException=Unable to determine the number of 
sessions in the session store, assuming that the store is empty
 persistentManager.swapIn=Swapping session [{0}] in from Store
 persistentManager.swapInException=Exception in the Store during swapIn: [{0}]
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 2b9b92d..9f52c44 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -310,12 +310,13 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  * @return {@code true}, if the session id is loaded in memory
  * otherwise {@code false} is returned
  

[tomcat] branch master updated: Align with 9.0.x & 8.5.x

[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 dabcbc1  Align with 9.0.x & 8.5.x
dabcbc1 is described below

commit dabcbc120fcd5e9d8d23b193e1027cd927463cb6
Author: Mark Thomas 
AuthorDate: Mon May 4 14:10:14 2020 +0100

Align with 9.0.x & 8.5.x

Review of classes impacted by PR #285
---
 java/org/apache/catalina/session/PersistentManagerBase.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java 
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 97d8e29..9f52c44 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -308,9 +308,9 @@ public abstract class PersistentManagerBase extends 
ManagerBase
  *
  * @param id The session id for the session to be searched for
  * @return {@code true}, if the session id is loaded in memory
- *  otherwise {@code false} is returned
+ * otherwise {@code false} is returned
  */
-public boolean isLoaded(String id){
+public boolean isLoaded(String id) {
 try {
 if (super.findSession(id) != null) {
 return true;


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

[Bug 64409] Usage of TLS is insecure

[bugzilla]

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

--- Comment #3 from mgrigorov  ---
Hi,

I was not able to find any Oracle document saying this but I've found one in
IBM documentation:

https://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jsse2Docs/matchsslcontext_tls.html

The way I understand it:

SSLContext#getInstance("TLS") returns an instance with support for the latest
TLS version for the particular JVM runtime.
I.e. for JDK 8 it will be TLSv1.2, but for JDK 11+ it will be TLSv1.3.

So by using 'SSLContext#getInstance("TLS")' you get the best/newest impl for
your version of Java.

-- 
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] 02/02: Additional clean-up after enhanced for loop changes

[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 6e6378d7755b44187b9bd23ead5dd2c57015bb02
Author: Mark Thomas 
AuthorDate: Fri May 1 23:13:26 2020 +0100

Additional clean-up after enhanced for loop changes
---
 java/javax/el/Util.java|  6 +--
 .../servlet/jsp/el/ImplicitObjectELResolver.java   | 20 -
 .../javax/servlet/jsp/tagext/SimpleTagSupport.java |  3 +-
 .../javax/servlet/jsp/tagext/TagAttributeInfo.java |  6 +--
 java/org/apache/catalina/connector/Request.java|  6 +--
 .../catalina/core/ApplicationFilterFactory.java|  8 ++--
 java/org/apache/catalina/core/StandardContext.java | 23 +-
 .../catalina/ha/context/ReplicatedContext.java | 20 +
 .../catalina/loader/WebappClassLoaderBase.java |  3 +-
 .../manager/host/HTMLHostManagerServlet.java   | 37 ++--
 java/org/apache/catalina/realm/RealmBase.java  | 32 +++---
 .../apache/catalina/session/StandardSession.java   | 49 -
 .../catalina/startup/ClassLoaderFactory.java   | 23 ++
 .../interceptors/FragmentationInterceptor.java |  4 +-
 .../tribes/transport/nio/NioReplicationTask.java   | 13 +-
 .../apache/catalina/util/ExtensionValidator.java   |  9 +---
 java/org/apache/el/util/ReflectionUtil.java|  6 +--
 java/org/apache/jasper/JspC.java   | 17 
 java/org/apache/jasper/compiler/Generator.java | 12 ++
 java/org/apache/jasper/compiler/JspUtil.java   |  8 ++--
 .../org/apache/tomcat/util/IntrospectionUtils.java |  9 ++--
 java/org/apache/tomcat/util/buf/ByteChunk.java |  1 -
 .../apache/tomcat/util/modeler/BaseModelMBean.java |  1 -
 .../MbeansDescriptorsIntrospectionSource.java  |  6 +--
 .../tomcat/websocket/AuthenticatorFactory.java |  1 -
 .../group/TestGroupChannelMemberArrival.java   |  4 +-
 .../interceptors/TestDomainFilterInterceptor.java  |  2 +-
 .../group/interceptors/TestOrderInterceptor.java   |  4 +-
 .../tribes/test/channel/TestDataIntegrity.java | 50 +++---
 .../tribes/test/channel/TestMulticastPackages.java |  4 +-
 .../tribes/test/channel/TestUdpPackages.java   |  8 ++--
 webapps/examples/jsp/checkbox/checkresult.jsp  | 20 +
 webapps/examples/jsp/sessions/carts.jsp|  4 +-
 33 files changed, 186 insertions(+), 233 deletions(-)

diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index 3b42663..57d779d 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -550,11 +550,11 @@ class Util {
 (jreCompat.canAcccess(base, m) || base != null && 
jreCompat.canAcccess(null, m {
 return m;
 }
-Class[] inf = type.getInterfaces();
+Class[] interfaces = type.getInterfaces();
 Method mp = null;
-for (Class aClass : inf) {
+for (Class iface : interfaces) {
 try {
-mp = aClass.getMethod(m.getName(), m.getParameterTypes());
+mp = iface.getMethod(m.getName(), m.getParameterTypes());
 mp = getMethod(mp.getDeclaringClass(), base, mp);
 if (mp != null) {
 return mp;
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java 
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index d791736..41aaf5e 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -269,12 +269,11 @@ public class ImplicitObjectELResolver extends ELResolver {
 this.cookie = new ScopeMap() {
 @Override
 protected Enumeration getAttributeNames() {
-Cookie[] c = ((HttpServletRequest) page.getRequest())
-.getCookies();
-if (c != null) {
+Cookie[] cookies = ((HttpServletRequest) 
page.getRequest()).getCookies();
+if (cookies != null) {
 Vector v = new Vector();
-for (Cookie value : c) {
-v.add(value.getName());
+for (Cookie cookie : cookies) {
+v.add(cookie.getName());
 }
 return v.elements();
 }
@@ -283,12 +282,11 @@ public class ImplicitObjectELResolver extends ELResolver {
 
 @Override
 protected Cookie getAttribute(String name) {
-Cookie[] c = ((HttpServletRequest) page.getRequest())
-.getCookies();
-if (c != null) {
-for (Cookie value : c) {
-if 

[tomcat] branch 7.0.x updated (b0c0243 -> 6e6378d)

[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 b0c0243  Skip untranslated values on import
 new 9e5853d  Replace indexed for loops and iterator while with foreach
 new 6e6378d  Additional clean-up after enhanced for loop changes

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/javax/el/BeanELResolver.java  |   6 +-
 java/javax/el/Util.java|  12 +-
 java/javax/servlet/ServletSecurityElement.java |  12 +-
 .../servlet/jsp/el/ImplicitObjectELResolver.java   |  26 ++-
 .../javax/servlet/jsp/tagext/SimpleTagSupport.java |   3 +-
 .../javax/servlet/jsp/tagext/TagAttributeInfo.java |  10 +-
 java/javax/servlet/jsp/tagext/TagData.java |   4 +-
 java/javax/servlet/jsp/tagext/TagLibraryInfo.java  |  18 +-
 .../catalina/ant/jmx/JMXAccessorQueryTask.java |  12 +-
 .../catalina/authenticator/AuthenticatorBase.java  |   6 +-
 .../catalina/authenticator/FormAuthenticator.java  |   4 +-
 .../catalina/authenticator/SingleSignOn.java   |   6 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |   8 +-
 java/org/apache/catalina/connector/Request.java|  14 +-
 .../catalina/core/ApplicationFilterFactory.java|  24 +--
 .../catalina/core/ApplicationHttpRequest.java  |   6 +-
 .../apache/catalina/core/ApplicationRequest.java   |   6 +-
 java/org/apache/catalina/core/ContainerBase.java   |   8 +-
 java/org/apache/catalina/core/StandardContext.java | 140 +++---
 java/org/apache/catalina/core/StandardHost.java|   4 +-
 java/org/apache/catalina/core/StandardServer.java  |  22 +--
 java/org/apache/catalina/deploy/FilterMap.java |   8 +-
 .../apache/catalina/deploy/SecurityCollection.java |  15 +-
 .../apache/catalina/deploy/SecurityConstraint.java |  28 +--
 .../catalina/filters/CsrfPreventionFilterBase.java |   6 +-
 .../apache/catalina/filters/RemoteIpFilter.java|   4 +-
 .../catalina/filters/RequestDumperFilter.java  |   6 +-
 .../catalina/ha/context/ReplicatedContext.java |  20 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  10 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   8 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  14 +-
 .../apache/catalina/ha/session/DeltaRequest.java   |  43 +++--
 .../apache/catalina/ha/session/DeltaSession.java   |  10 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |   8 +-
 .../catalina/loader/WebappClassLoaderBase.java |  17 +-
 java/org/apache/catalina/loader/WebappLoader.java  |  36 ++--
 .../catalina/manager/HTMLManagerServlet.java   |   5 +-
 .../apache/catalina/manager/ManagerServlet.java|  18 +-
 .../manager/host/HTMLHostManagerServlet.java   |  38 ++--
 .../catalina/manager/host/HostManagerServlet.java  |   4 +-
 .../apache/catalina/manager/util/SessionUtils.java |  16 +-
 .../org/apache/catalina/mbeans/ContainerMBean.java |   8 +-
 java/org/apache/catalina/mbeans/MBeanFactory.java  |  27 +--
 java/org/apache/catalina/mbeans/MBeanUtils.java|   6 +-
 .../catalina/mbeans/NamingResourcesMBean.java  |  37 ++--
 .../apache/catalina/realm/GenericPrincipal.java|   4 +-
 .../apache/catalina/realm/JAASCallbackHandler.java |  40 ++--
 .../catalina/realm/JAASMemoryLoginModule.java  |   5 +-
 java/org/apache/catalina/realm/JAASRealm.java  |  14 +-
 java/org/apache/catalina/realm/JNDIRealm.java  |   6 +-
 java/org/apache/catalina/realm/RealmBase.java  | 102 +--
 java/org/apache/catalina/session/FileStore.java|   4 +-
 java/org/apache/catalina/session/ManagerBase.java  |   4 +-
 .../catalina/session/PersistentManagerBase.java|  36 ++--
 .../apache/catalina/session/StandardManager.java   |   3 +-
 .../apache/catalina/session/StandardSession.java   |  93 --
 java/org/apache/catalina/session/StoreBase.java|  16 +-
 .../catalina/ssi/SSIServletExternalResolver.java   |   3 +-
 java/org/apache/catalina/startup/Catalina.java |  16 +-
 .../catalina/startup/ClassLoaderFactory.java   |  41 +++--
 .../org/apache/catalina/startup/ContextConfig.java |  29 ++-
 java/org/apache/catalina/startup/ExpandWar.java|   4 +-
 .../apache/catalina/startup/HomesUserDatabase.java |   6 +-
 java/org/apache/catalina/startup/HostConfig.java   |  70 +++
 .../catalina/startup/SetAllPropertiesRule.java |   2 +-
 java/org/apache/catalina/startup/WebRuleSet.java   |   7 +-
 .../apache/catalina/tribes/ChannelException.java   |   3 +-
 .../apache/catalina/tribes/group/GroupChannel.java |  14 +-
 .../interceptors/FragmentationInterceptor.java |  18 +-
 .../group/interceptors/NonBlockingCoordinator.java |  12 +-
 .../group/interceptors/OrderInterceptor.java 

[GitHub] [tomcat] markt-asf commented on pull request #273: Use enhanced for loops where possible

[GitBox]

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


   Applied manually with some minor changes (and a larger follow-on commit)



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] branch 8.5.x updated (db47aa4 -> 041ae23)

[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 db47aa4  Skip untranslated values on import
 new 26c4c04  Replace indexed for loops and iterator while with foreach
 new 041ae23  Additional clean-up after enhanced for loop changes

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/javax/el/BeanELResolver.java  |   6 +-
 java/javax/el/Util.java|  12 +-
 java/javax/servlet/ServletSecurityElement.java |  12 +-
 .../servlet/jsp/el/ImplicitObjectELResolver.java   |  26 ++-
 .../javax/servlet/jsp/tagext/SimpleTagSupport.java |   3 +-
 .../javax/servlet/jsp/tagext/TagAttributeInfo.java |  10 +-
 java/javax/servlet/jsp/tagext/TagData.java |   4 +-
 java/javax/servlet/jsp/tagext/TagLibraryInfo.java  |  18 +-
 .../catalina/ant/jmx/JMXAccessorQueryTask.java |   6 +-
 .../catalina/authenticator/AuthenticatorBase.java  |   6 +-
 .../catalina/authenticator/BasicAuthenticator.java |   6 +-
 .../catalina/authenticator/FormAuthenticator.java  |   4 +-
 .../catalina/authenticator/SingleSignOn.java   |   6 +-
 .../apache/catalina/connector/CoyoteAdapter.java   |   8 +-
 java/org/apache/catalina/connector/Request.java|  14 +-
 .../catalina/core/ApplicationFilterFactory.java|  24 +--
 .../catalina/core/ApplicationHttpRequest.java  |   4 +-
 .../apache/catalina/core/ApplicationRequest.java   |   4 +-
 java/org/apache/catalina/core/ContainerBase.java   |  14 +-
 java/org/apache/catalina/core/StandardContext.java | 137 +++---
 java/org/apache/catalina/core/StandardHost.java|   4 +-
 java/org/apache/catalina/core/StandardServer.java  |  22 +--
 .../catalina/filters/CsrfPreventionFilterBase.java |   6 +-
 .../apache/catalina/filters/RemoteIpFilter.java|   4 +-
 .../catalina/filters/RequestDumperFilter.java  |   6 +-
 .../catalina/ha/context/ReplicatedContext.java |  20 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  10 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |   8 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  14 +-
 .../apache/catalina/ha/session/DeltaRequest.java   |  45 +++--
 .../apache/catalina/ha/session/DeltaSession.java   |  10 +-
 .../apache/catalina/ha/tcp/ReplicationValve.java   |   8 +-
 .../catalina/loader/WebappClassLoaderBase.java |  17 +-
 java/org/apache/catalina/loader/WebappLoader.java  |  32 ++--
 .../catalina/manager/HTMLManagerServlet.java   |   5 +-
 .../apache/catalina/manager/ManagerServlet.java|  18 +-
 .../manager/host/HTMLHostManagerServlet.java   |  33 ++--
 .../catalina/manager/host/HostManagerServlet.java  |   4 +-
 .../apache/catalina/manager/util/SessionUtils.java |  16 +-
 java/org/apache/catalina/mapper/Mapper.java|   4 +-
 .../org/apache/catalina/mbeans/ContainerMBean.java |   8 +-
 java/org/apache/catalina/mbeans/MBeanFactory.java  |  27 +--
 java/org/apache/catalina/mbeans/MBeanUtils.java|   6 +-
 .../catalina/mbeans/NamingResourcesMBean.java  |  25 +--
 .../apache/catalina/realm/GenericPrincipal.java|   4 +-
 .../apache/catalina/realm/JAASCallbackHandler.java |  46 +++--
 .../catalina/realm/JAASMemoryLoginModule.java  |   4 +-
 java/org/apache/catalina/realm/JAASRealm.java  |  12 +-
 java/org/apache/catalina/realm/JNDIRealm.java  |   6 +-
 java/org/apache/catalina/realm/RealmBase.java  | 107 ++-
 java/org/apache/catalina/session/FileStore.java|   4 +-
 java/org/apache/catalina/session/ManagerBase.java  |   4 +-
 .../catalina/session/PersistentManagerBase.java|  36 ++--
 .../apache/catalina/session/StandardManager.java   |   3 +-
 .../apache/catalina/session/StandardSession.java   |  93 --
 java/org/apache/catalina/session/StoreBase.java|  16 +-
 .../catalina/ssi/SSIServletExternalResolver.java   |   3 +-
 java/org/apache/catalina/startup/Catalina.java |  16 +-
 .../catalina/startup/ClassLoaderFactory.java   |  40 ++--
 .../org/apache/catalina/startup/ContextConfig.java |  29 ++-
 java/org/apache/catalina/startup/ExpandWar.java|   4 +-
 .../apache/catalina/startup/HomesUserDatabase.java |   6 +-
 java/org/apache/catalina/startup/HostConfig.java   |  70 +++
 .../catalina/startup/SetAllPropertiesRule.java |   2 +-
 .../catalina/storeconfig/StandardContextSF.java|  15 +-
 .../catalina/storeconfig/StandardEngineSF.java |   6 +-
 .../catalina/storeconfig/StandardHostSF.java   |   6 +-
 .../apache/catalina/storeconfig/StoreAppender.java |  14 +-
 .../catalina/storeconfig/StoreFactoryBase.java |   4 +-
 .../apache/catalina/tribes/ChannelException.java   |   3 +-
 .../apache/catalina/tribes/group/GroupChannel.java 

[tomcat] 02/02: Additional clean-up after enhanced for loop changes

[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 041ae238ca41386a3a8205528664ce48e619d183
Author: Mark Thomas 
AuthorDate: Fri May 1 23:13:26 2020 +0100

Additional clean-up after enhanced for loop changes
---
 java/javax/el/Util.java|  6 +--
 .../servlet/jsp/el/ImplicitObjectELResolver.java   | 20 -
 .../javax/servlet/jsp/tagext/SimpleTagSupport.java |  3 +-
 .../javax/servlet/jsp/tagext/TagAttributeInfo.java |  6 +--
 java/org/apache/catalina/connector/Request.java|  6 +--
 .../catalina/core/ApplicationFilterFactory.java|  8 ++--
 java/org/apache/catalina/core/StandardContext.java | 23 +-
 .../catalina/ha/context/ReplicatedContext.java | 20 +
 .../catalina/loader/WebappClassLoaderBase.java |  3 +-
 .../manager/host/HTMLHostManagerServlet.java   | 32 ++
 java/org/apache/catalina/realm/RealmBase.java  | 32 +++---
 .../apache/catalina/session/StandardSession.java   | 49 -
 java/org/apache/catalina/startup/Catalina.java | 18 +++-
 .../catalina/startup/ClassLoaderFactory.java   | 23 ++
 .../interceptors/FragmentationInterceptor.java |  4 +-
 .../tribes/transport/nio/NioReplicationTask.java   | 13 +-
 .../apache/catalina/util/ExtensionValidator.java   |  9 +---
 .../catalina/valves/AbstractAccessLogValve.java|  6 +--
 java/org/apache/el/util/ReflectionUtil.java|  6 +--
 java/org/apache/jasper/JspC.java   | 17 
 java/org/apache/jasper/compiler/Generator.java | 12 ++
 java/org/apache/jasper/compiler/JspUtil.java   |  8 ++--
 .../apache/jasper/servlet/JspCServletContext.java  |  3 +-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  3 +-
 .../org/apache/tomcat/util/IntrospectionUtils.java |  9 ++--
 java/org/apache/tomcat/util/buf/ByteChunk.java |  1 -
 .../apache/tomcat/util/modeler/BaseModelMBean.java |  1 -
 .../MbeansDescriptorsIntrospectionSource.java  |  6 +--
 .../tomcat/util/net/openssl/OpenSSLConf.java   |  6 +--
 .../tomcat/websocket/AuthenticatorFactory.java |  1 -
 .../group/TestGroupChannelMemberArrival.java   |  4 +-
 .../interceptors/TestDomainFilterInterceptor.java  |  2 +-
 .../group/interceptors/TestOrderInterceptor.java   |  4 +-
 .../tribes/test/channel/TestDataIntegrity.java | 50 +++---
 .../tribes/test/channel/TestMulticastPackages.java |  4 +-
 .../tribes/test/channel/TestUdpPackages.java   |  8 ++--
 webapps/examples/jsp/checkbox/checkresult.jsp  | 20 +
 webapps/examples/jsp/sessions/carts.jsp|  4 +-
 38 files changed, 199 insertions(+), 251 deletions(-)

diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index cb1590c..2a01f3a 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -550,11 +550,11 @@ class Util {
 (jreCompat.canAcccess(base, m) || base != null && 
jreCompat.canAcccess(null, m {
 return m;
 }
-Class[] inf = type.getInterfaces();
+Class[] interfaces = type.getInterfaces();
 Method mp = null;
-for (Class aClass : inf) {
+for (Class iface : interfaces) {
 try {
-mp = aClass.getMethod(m.getName(), m.getParameterTypes());
+mp = iface.getMethod(m.getName(), m.getParameterTypes());
 mp = getMethod(mp.getDeclaringClass(), base, mp);
 if (mp != null) {
 return mp;
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java 
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 819ac98..07c4557 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -254,12 +254,11 @@ public class ImplicitObjectELResolver extends ELResolver {
 this.cookie = new ScopeMap() {
 @Override
 protected Enumeration getAttributeNames() {
-Cookie[] c = ((HttpServletRequest) page.getRequest())
-.getCookies();
-if (c != null) {
+Cookie[] cookies = ((HttpServletRequest) 
page.getRequest()).getCookies();
+if (cookies != null) {
 Vector v = new Vector<>();
-for (Cookie value : c) {
-v.add(value.getName());
+for (Cookie cookie : cookies) {
+v.add(cookie.getName());
 }
 return v.elements();
 }
@@ -268,12 +267,11 @@ public class ImplicitObjectELResolver extends ELResolver {
 
 @Override
 

buildbot failure in on tomcat-9-trunk

[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/214

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] c9b0a09a7f6495522a441fa88e8d8caa869e413d
Blamelist: Lars Grefer ,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