date:20241129

[Bug 69479] The HTTP2 header data is confused in H2C, resulting in parsing failure

2024-11-29 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

   Severity|critical|normal

--- Comment #2 from Mark Thomas  ---
No response in almost 48 hours. Clearly not "critical". Reducing severity to
normal.

-- 
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 main updated: Fix schema according to code

2024-11-29 Thread remm

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

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new af1ae7a101 Fix schema according to code
af1ae7a101 is described below

commit af1ae7a10184c40d4c60c78a86277d086e7bb19f
Author: remm 
AuthorDate: Fri Nov 29 13:14:30 2024 +0100

Fix schema according to code

I would assume this access log is unused.
Add test case.
The "common" pattern used is wrong though (it should be everything from
"combined" except referer and userAgent), but I prefer not fixing it for
compat reasons.
---
 .../apache/catalina/valves/JDBCAccessLogValve.java |   7 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 118 +
 2 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 0f4d0945b2..8db7569320 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -68,11 +68,11 @@ import org.apache.tomcat.util.ExceptionUtils;
  * remoteHost CHAR(15) NOT NULL,
  * userName CHAR(15),
  * timestamp TIMESTAMP NOT NULL,
- * virtualHost VARCHAR(64) NOT NULL,
- * method VARCHAR(8) NOT NULL,
  * query VARCHAR(255) NOT NULL,
  * status SMALLINT UNSIGNED NOT NULL,
  * bytes INT UNSIGNED NOT NULL,
+ * virtualHost VARCHAR(64) NOT NULL,
+ * method VARCHAR(8) NOT NULL,
  * referer VARCHAR(128),
  * userAgent VARCHAR(128),
  * PRIMARY KEY (id),
@@ -95,9 +95,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * If the request method is "common", only these fields are used:
  * remoteHost, user, timeStamp, query, status, bytes
  * 
- * 
- * TO DO: provide option for excluding logging of certain MIME types.
- * 
  *
  * @author Andre de Jesus
  * @author Peter Rossbach
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
new file mode 100644
index 00..1c0c143615
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestJDBCAccessLogValve extends TomcatBaseTest {
+
+public static final String SCHEMA =
+"CREATE TABLE access (\n" +
+"  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, 
Increment by 1),\n" +
+"  remoteHost CHAR(15) NOT NULL,\n" +
+"  userName CHAR(15),\n" +
+"  timestamp TIMESTAMP NOT NULL,\n" +
+"  query VARCHAR(255),\n" +
+"  status SMALLINT NOT NULL,\n" +
+"  bytes INT NOT NULL,\n" +
+"  virtualHost VARCHAR(64),\n" +
+"  method VARCHAR(8),\n" +
+"  referer VARCHAR(128),\n" +
+"  userAgent VARCHAR(128)\n" +
+")";
+
+@Parameterized.Parameters(name = "{index}: logPattern[{0}]")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] {"common"});
+parameterSets.add(new Object[] {"combined"});
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String logPattern;
+
+@Test
+public void testValve() throws Exception {
+
+String connectionURL = "jdbc:derby:" + 
getTemporaryDirectory().getAbsolutePat

(tomcat) branch 11.0.x updated: Fix schema according to code

2024-11-29 Thread remm

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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 342306da3b Fix schema according to code
342306da3b is described below

commit 342306da3b4821169fd69025549ee136d1e4d7a3
Author: remm 
AuthorDate: Fri Nov 29 13:14:30 2024 +0100

Fix schema according to code

I would assume this access log is unused.
Add test case.
The "common" pattern used is wrong though (it should be everything from
"combined" except referer and userAgent), but I prefer not fixing it for
compat reasons.
---
 .../apache/catalina/valves/JDBCAccessLogValve.java |   7 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 118 +
 2 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 0f4d0945b2..8db7569320 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -68,11 +68,11 @@ import org.apache.tomcat.util.ExceptionUtils;
  * remoteHost CHAR(15) NOT NULL,
  * userName CHAR(15),
  * timestamp TIMESTAMP NOT NULL,
- * virtualHost VARCHAR(64) NOT NULL,
- * method VARCHAR(8) NOT NULL,
  * query VARCHAR(255) NOT NULL,
  * status SMALLINT UNSIGNED NOT NULL,
  * bytes INT UNSIGNED NOT NULL,
+ * virtualHost VARCHAR(64) NOT NULL,
+ * method VARCHAR(8) NOT NULL,
  * referer VARCHAR(128),
  * userAgent VARCHAR(128),
  * PRIMARY KEY (id),
@@ -95,9 +95,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * If the request method is "common", only these fields are used:
  * remoteHost, user, timeStamp, query, status, bytes
  * 
- * 
- * TO DO: provide option for excluding logging of certain MIME types.
- * 
  *
  * @author Andre de Jesus
  * @author Peter Rossbach
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
new file mode 100644
index 00..1c0c143615
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestJDBCAccessLogValve extends TomcatBaseTest {
+
+public static final String SCHEMA =
+"CREATE TABLE access (\n" +
+"  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, 
Increment by 1),\n" +
+"  remoteHost CHAR(15) NOT NULL,\n" +
+"  userName CHAR(15),\n" +
+"  timestamp TIMESTAMP NOT NULL,\n" +
+"  query VARCHAR(255),\n" +
+"  status SMALLINT NOT NULL,\n" +
+"  bytes INT NOT NULL,\n" +
+"  virtualHost VARCHAR(64),\n" +
+"  method VARCHAR(8),\n" +
+"  referer VARCHAR(128),\n" +
+"  userAgent VARCHAR(128)\n" +
+")";
+
+@Parameterized.Parameters(name = "{index}: logPattern[{0}]")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] {"common"});
+parameterSets.add(new Object[] {"combined"});
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String logPattern;
+
+@Test
+public void testValve() throws Exception {
+
+String connectionURL = "jdbc:derby:" + 
getTemporaryDirectory().getAbsolut

(tomcat) branch 10.1.x updated: Fix schema according to code

2024-11-29 Thread remm

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new f27f6163e6 Fix schema according to code
f27f6163e6 is described below

commit f27f6163e66e0d30e8b1c67daa2001b767078ab3
Author: remm 
AuthorDate: Fri Nov 29 13:14:30 2024 +0100

Fix schema according to code

I would assume this access log is unused.
Add test case.
The "common" pattern used is wrong though (it should be everything from
"combined" except referer and userAgent), but I prefer not fixing it for
compat reasons.
---
 .../apache/catalina/valves/JDBCAccessLogValve.java |   7 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 118 +
 2 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 0f4d0945b2..8db7569320 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -68,11 +68,11 @@ import org.apache.tomcat.util.ExceptionUtils;
  * remoteHost CHAR(15) NOT NULL,
  * userName CHAR(15),
  * timestamp TIMESTAMP NOT NULL,
- * virtualHost VARCHAR(64) NOT NULL,
- * method VARCHAR(8) NOT NULL,
  * query VARCHAR(255) NOT NULL,
  * status SMALLINT UNSIGNED NOT NULL,
  * bytes INT UNSIGNED NOT NULL,
+ * virtualHost VARCHAR(64) NOT NULL,
+ * method VARCHAR(8) NOT NULL,
  * referer VARCHAR(128),
  * userAgent VARCHAR(128),
  * PRIMARY KEY (id),
@@ -95,9 +95,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * If the request method is "common", only these fields are used:
  * remoteHost, user, timeStamp, query, status, bytes
  * 
- * 
- * TO DO: provide option for excluding logging of certain MIME types.
- * 
  *
  * @author Andre de Jesus
  * @author Peter Rossbach
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
new file mode 100644
index 00..1c0c143615
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestJDBCAccessLogValve extends TomcatBaseTest {
+
+public static final String SCHEMA =
+"CREATE TABLE access (\n" +
+"  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, 
Increment by 1),\n" +
+"  remoteHost CHAR(15) NOT NULL,\n" +
+"  userName CHAR(15),\n" +
+"  timestamp TIMESTAMP NOT NULL,\n" +
+"  query VARCHAR(255),\n" +
+"  status SMALLINT NOT NULL,\n" +
+"  bytes INT NOT NULL,\n" +
+"  virtualHost VARCHAR(64),\n" +
+"  method VARCHAR(8),\n" +
+"  referer VARCHAR(128),\n" +
+"  userAgent VARCHAR(128)\n" +
+")";
+
+@Parameterized.Parameters(name = "{index}: logPattern[{0}]")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] {"common"});
+parameterSets.add(new Object[] {"combined"});
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String logPattern;
+
+@Test
+public void testValve() throws Exception {
+
+String connectionURL = "jdbc:derby:" + 
getTemporaryDirectory().getAbsolut

(tomcat) 02/02: jakarta -> javax

2024-11-29 Thread remm

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

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

commit 9ab3db449693bacd76db7661a510eea6b0fbc567
Author: remm 
AuthorDate: Fri Nov 29 13:23:13 2024 +0100

jakarta -> javax
---
 test/org/apache/catalina/valves/TestJDBCAccessLogValve.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 1c0c143615..621f972c38 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;


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

(tomcat) 01/02: Fix schema according to code

2024-11-29 Thread remm

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

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

commit 90c8745a9a39e2e6c82ef721e7f73554b33ba92f
Author: remm 
AuthorDate: Fri Nov 29 13:14:30 2024 +0100

Fix schema according to code

I would assume this access log is unused.
Add test case.
The "common" pattern used is wrong though (it should be everything from
"combined" except referer and userAgent), but I prefer not fixing it for
compat reasons.
---
 .../apache/catalina/valves/JDBCAccessLogValve.java |   7 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 118 +
 2 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index cbb3a87c97..6ece27a82f 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -68,11 +68,11 @@ import org.apache.tomcat.util.ExceptionUtils;
  * remoteHost CHAR(15) NOT NULL,
  * userName CHAR(15),
  * timestamp TIMESTAMP NOT NULL,
- * virtualHost VARCHAR(64) NOT NULL,
- * method VARCHAR(8) NOT NULL,
  * query VARCHAR(255) NOT NULL,
  * status SMALLINT UNSIGNED NOT NULL,
  * bytes INT UNSIGNED NOT NULL,
+ * virtualHost VARCHAR(64) NOT NULL,
+ * method VARCHAR(8) NOT NULL,
  * referer VARCHAR(128),
  * userAgent VARCHAR(128),
  * PRIMARY KEY (id),
@@ -95,9 +95,6 @@ import org.apache.tomcat.util.ExceptionUtils;
  * If the request method is "common", only these fields are used:
  * remoteHost, user, timeStamp, query, status, bytes
  * 
- * 
- * TO DO: provide option for excluding logging of certain MIME types.
- * 
  *
  * @author Andre de Jesus
  * @author Peter Rossbach
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
new file mode 100644
index 00..1c0c143615
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestJDBCAccessLogValve extends TomcatBaseTest {
+
+public static final String SCHEMA =
+"CREATE TABLE access (\n" +
+"  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, 
Increment by 1),\n" +
+"  remoteHost CHAR(15) NOT NULL,\n" +
+"  userName CHAR(15),\n" +
+"  timestamp TIMESTAMP NOT NULL,\n" +
+"  query VARCHAR(255),\n" +
+"  status SMALLINT NOT NULL,\n" +
+"  bytes INT NOT NULL,\n" +
+"  virtualHost VARCHAR(64),\n" +
+"  method VARCHAR(8),\n" +
+"  referer VARCHAR(128),\n" +
+"  userAgent VARCHAR(128)\n" +
+")";
+
+@Parameterized.Parameters(name = "{index}: logPattern[{0}]")
+public static Collection parameters() {
+List parameterSets = new ArrayList<>();
+
+parameterSets.add(new Object[] {"common"});
+parameterSets.add(new Object[] {"combined"});
+
+return parameterSets;
+}
+
+@Parameter(0)
+public String logPattern;
+
+@Test
+public void testValve() throws Exception {
+
+String connectionURL = "jdbc:derby:" + 
getTemporaryDirectory().getAbsolutePath() + "/" + logPattern;
+
+Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+try (Connection connection = DriverManager.getCon

(tomcat) branch 9.0.x updated (ab6778ab84 -> 9ab3db4496)

2024-11-29 Thread remm

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

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


from ab6778ab84 Fix typos
 new 90c8745a9a Fix schema according to code
 new 9ab3db4496 jakarta -> javax

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/valves/JDBCAccessLogValve.java |   7 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 118 +
 2 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 test/org/apache/catalina/valves/TestJDBCAccessLogValve.java


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

Re: (tomcat) Opportunities for contribution

2024-11-29 Thread Mark Thomas


On 28/11/2024 13:04, No One wrote:

Hello,
Do you have something like "good first issue" or "help wanted" labeled
issues to start a contribution to Apache Tomcat project?

Kind regards


Hi,

I am afraid not. One of the down sides of keeping on top of the bug 
reports (we release monthly and include a fix for every open bug report 
with a reproducible test case in that release) is that we don't have a 
pile of easy bug fixes ready for new people to pick up.


There are about 75 open enhancement requests in various stages of 
development from just an idea to complete patch 9that probably needs 
updating). You could have a look through those and see if something 
catches your eye. Best to discuss it here first as you don't want to put 
in a lot of effort only for the enhancement to be rejected.


Other things worth considering:
- Reviving the Maven Tomcat plugin
- improving code coverage of the tests
- JASPIC / Jakarta Authentication implementations of BASIC, FORM and
  CLIENT-CERT (not sure how practical that last one is)
- Write a guide for using Bouncy Castle with Tomcat
- Expand cluster encryption to include multi-cast cluster membership

Generally, I recommend picking an area that is relevant and/or 
interesting to you.


HTH,

Mark

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

Buildbot failure in on tomcat-12.0.x

2024-11-29 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/120/builds/245
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] af1ae7a10184c40d4c60c78a86277d086e7bb19f


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_12: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Buildbot failure in on tomcat-11.0.x

2024-11-29 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1417
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 11.0.x] 342306da3b4821169fd69025549ee136d1e4d7a3


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_12: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

Re: (tomcat) Opportunities for contribution

2024-11-29 Thread Rémy Maucherat

On Fri, Nov 29, 2024 at 1:56 PM Mark Thomas  wrote:
>
> On 28/11/2024 13:04, No One wrote:
> > Hello,
> > Do you have something like "good first issue" or "help wanted" labeled
> > issues to start a contribution to Apache Tomcat project?
> >
> > Kind regards
>
> Hi,
>
> I am afraid not. One of the down sides of keeping on top of the bug
> reports (we release monthly and include a fix for every open bug report
> with a reproducible test case in that release) is that we don't have a
> pile of easy bug fixes ready for new people to pick up.
>
> There are about 75 open enhancement requests in various stages of
> development from just an idea to complete patch 9that probably needs
> updating). You could have a look through those and see if something
> catches your eye. Best to discuss it here first as you don't want to put
> in a lot of effort only for the enhancement to be rejected.
>
> Other things worth considering:
> - Reviving the Maven Tomcat plugin

+1
The submitted PR is a hacked together port. I didn't feel like hitting
the merge button.
https://github.com/apache/tomcat-maven-plugin/pull/43

> - improving code coverage of the tests

+1 too

> - JASPIC / Jakarta Authentication implementations of BASIC, FORM and
>CLIENT-CERT (not sure how practical that last one is)
> - Write a guide for using Bouncy Castle with Tomcat
> - Expand cluster encryption to include multi-cast cluster membership
>
> Generally, I recommend picking an area that is relevant and/or
> interesting to you.

Rémy

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

[Bug 69479] The HTTP2 header data is confused in H2C, resulting in parsing failure

2024-11-29 Thread bugzilla

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

--- Comment #3 from Thomas  ---
I can't provide a reproducible test case because this problem only occurs a few
times in an hour of running.

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

Buildbot failure in on tomcat-10.1.x

2024-11-29 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/1525
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 10.1.x] f27f6163e66e0d30e8b1c67daa2001b767078ab3


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[Bug 69479] The HTTP2 header data is confused in H2C, resulting in parsing failure

2024-11-29 Thread bugzilla

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

--- Comment #4 from Christopher Schultz  ---
Are you able to use a recent version of Tomcat 9.0.x? You could run that and
see if the intermittent problems disappear.

-- 
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 main updated: Fix warnings during native image compilation

2024-11-29 Thread markt

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

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


The following commit(s) were added to refs/heads/main by this push:
 new e27c8ae820 Fix warnings during native image compilation
e27c8ae820 is described below

commit e27c8ae820d7c81495e552afdc2c7048bac63f67
Author: Mark Thomas 
AuthorDate: Fri Nov 29 14:21:10 2024 +

Fix warnings during native image compilation
---
 res/graal/README.md  |  4 ++--
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../tomcat-embed-el/native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 webapps/docs/changelog.xml   |  4 
 17 files changed, 6 insertions(+), 82 deletions(-)

diff --git a/res/graal/README.md b/res/graal/README.md
index 717c761c18..ab787a5306 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -30,11 +30,11 @@ Reflection Directives
 ===
 
 This directory contains directives to the compiler on what classes use 
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `reflect-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
 This directory also contains resource directives, so that resource files 
normally included in a JAR file
 also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `resource-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties 
b/res/graal/tomcat-embed-core/native-image/native-image.properties
deleted file mode 100644
index 894470185e..00
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json 
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json 
b/res/graal/tomcat-embed-core/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-core/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json 
b/res/graal/tomcat-embed-core/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-core/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties 
b/res/graal/tomcat-embed-el/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..00
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright

(tomcat) branch 11.0.x updated: Fix warnings during native image compilation

2024-11-29 Thread markt

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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new d3c687570b Fix warnings during native image compilation
d3c687570b is described below

commit d3c687570bbe078f1b8e450d1dba0434cfa5702d
Author: Mark Thomas 
AuthorDate: Fri Nov 29 14:21:10 2024 +

Fix warnings during native image compilation
---
 res/graal/README.md  |  4 ++--
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../tomcat-embed-el/native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 webapps/docs/changelog.xml   |  8 
 17 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/res/graal/README.md b/res/graal/README.md
index 717c761c18..ab787a5306 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -30,11 +30,11 @@ Reflection Directives
 ===
 
 This directory contains directives to the compiler on what classes use 
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `reflect-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
 This directory also contains resource directives, so that resource files 
normally included in a JAR file
 also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `resource-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties 
b/res/graal/tomcat-embed-core/native-image/native-image.properties
deleted file mode 100644
index 894470185e..00
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json 
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json 
b/res/graal/tomcat-embed-core/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-core/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json 
b/res/graal/tomcat-embed-core/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-core/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties 
b/res/graal/tomcat-embed-el/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..00
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding

(tomcat) branch 10.1.x updated: Fix warnings during native image compilation

2024-11-29 Thread markt

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 81cdc12036 Fix warnings during native image compilation
81cdc12036 is described below

commit 81cdc12036dd0d9b3d18d46d8b0d4032f55133cc
Author: Mark Thomas 
AuthorDate: Fri Nov 29 14:21:10 2024 +

Fix warnings during native image compilation
---
 res/graal/README.md  |  4 ++--
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../tomcat-embed-el/native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 webapps/docs/changelog.xml   |  8 
 17 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/res/graal/README.md b/res/graal/README.md
index 717c761c18..ab787a5306 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -30,11 +30,11 @@ Reflection Directives
 ===
 
 This directory contains directives to the compiler on what classes use 
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `reflect-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
 This directory also contains resource directives, so that resource files 
normally included in a JAR file
 also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `resource-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties 
b/res/graal/tomcat-embed-core/native-image/native-image.properties
deleted file mode 100644
index 894470185e..00
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json 
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json 
b/res/graal/tomcat-embed-core/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-core/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json 
b/res/graal/tomcat-embed-core/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-core/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties 
b/res/graal/tomcat-embed-el/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..00
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding

(tomcat) branch 9.0.x updated: Fix warnings during native image compilation

2024-11-29 Thread markt

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7b2d730035 Fix warnings during native image compilation
7b2d730035 is described below

commit 7b2d730035e96f66f54f65391d52fba2ce6f6738
Author: Mark Thomas 
AuthorDate: Fri Nov 29 14:21:10 2024 +

Fix warnings during native image compilation
---
 res/graal/README.md  |  4 ++--
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../tomcat-embed-el/native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 .../native-image/native-image.properties | 16 
 .../{tomcat-reflection.json => reflect-config.json}  |  0
 .../{tomcat-resource.json => resource-config.json}   |  0
 webapps/docs/changelog.xml   |  8 
 17 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/res/graal/README.md b/res/graal/README.md
index 717c761c18..ab787a5306 100644
--- a/res/graal/README.md
+++ b/res/graal/README.md
@@ -30,11 +30,11 @@ Reflection Directives
 ===
 
 This directory contains directives to the compiler on what classes use 
reflection.
-These are currently stored in a file called `tomcat-reflection.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `reflect-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
 This directory also contains resource directives, so that resource files 
normally included in a JAR file
 also get compiled into the executable image.
-These are currently stored in a file called `tomcat-resource.json` in the 
`META-INF/native-image/groupId/artifactId`
+These are currently stored in a file called `resource-config.json` in the 
`META-INF/native-image/groupId/artifactId`
 location.
 
diff --git a/res/graal/tomcat-embed-core/native-image/native-image.properties 
b/res/graal/tomcat-embed-core/native-image/native-image.properties
deleted file mode 100644
index 894470185e..00
--- a/res/graal/tomcat-embed-core/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-Args = -H:ReflectionConfigurationResources=${.}/tomcat-reflection.json 
-H:ResourceConfigurationResources=${.}/tomcat-resource.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-reflection.json 
b/res/graal/tomcat-embed-core/native-image/reflect-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-reflection.json
rename to res/graal/tomcat-embed-core/native-image/reflect-config.json
diff --git a/res/graal/tomcat-embed-core/native-image/tomcat-resource.json 
b/res/graal/tomcat-embed-core/native-image/resource-config.json
similarity index 100%
rename from res/graal/tomcat-embed-core/native-image/tomcat-resource.json
rename to res/graal/tomcat-embed-core/native-image/resource-config.json
diff --git a/res/graal/tomcat-embed-el/native-image/native-image.properties 
b/res/graal/tomcat-embed-el/native-image/native-image.properties
deleted file mode 100644
index 29b501fac1..00
--- a/res/graal/tomcat-embed-el/native-image/native-image.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding co

[Bug 69465] [GraalVM 21] Fix warnings during native image compilation

2024-11-29 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in:
- 11.0.x for 11.0.2 onwards
- 10.1.x for 10.1.34 onwards
-  9.0.x for  9.0.98 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

[Bug 69479] The HTTP2 header data is confused in H2C, resulting in parsing failure

2024-11-29 Thread bugzilla

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

--- Comment #5 from Mark Thomas  ---
A test case that generates the issue a few times an hour is a start. It doesn't
have to reproduce it instantly. We often find that provides some clues that
enable us to trigger the issue more frequently.

-- 
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 main updated: Improve test and extensibility

2024-11-29 Thread remm

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

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 3c390db8f6 Improve test and extensibility
3c390db8f6 is described below

commit 3c390db8f6036f7d539a52170ad39650db653ffd
Author: remm 
AuthorDate: Fri Nov 29 16:38:28 2024 +0100

Improve test and extensibility
---
 .../apache/catalina/valves/JDBCAccessLogValve.java | 59 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 52 ++-
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 8db7569320..590747ac9c 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -100,7 +100,8 @@ import org.apache.tomcat.util.ExceptionUtils;
  * @author Peter Rossbach
  */
 
-public final class JDBCAccessLogValve extends ValveBase implements AccessLog {
+public class JDBCAccessLogValve extends ValveBase implements AccessLog {
+
 
 // --- Constructors
 
@@ -156,47 +157,47 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @since 6.0.15
  */
-boolean useLongContentLength = false;
+protected boolean useLongContentLength = false;
 
 /**
  * The connection username to use when trying to connect to the database.
  */
-String connectionName = null;
+protected String connectionName = null;
 
 
 /**
  * The connection URL to use when trying to connect to the database.
  */
-String connectionPassword = null;
+protected String connectionPassword = null;
 
 /**
  * Instance of the JDBC Driver class we use as a connection factory.
  */
-Driver driver = null;
+protected Driver driver = null;
 
 
-private String driverName;
-private String connectionURL;
-private String tableName;
-private String remoteHostField;
-private String userField;
-private String timestampField;
-private String virtualHostField;
-private String methodField;
-private String queryField;
-private String statusField;
-private String bytesField;
-private String refererField;
-private String userAgentField;
-private String pattern;
-private boolean resolveHosts;
+protected String driverName;
+protected String connectionURL;
+protected String tableName;
+protected String remoteHostField;
+protected String userField;
+protected String timestampField;
+protected String virtualHostField;
+protected String methodField;
+protected String queryField;
+protected String statusField;
+protected String bytesField;
+protected String refererField;
+protected String userAgentField;
+protected String pattern;
+protected boolean resolveHosts;
 
 
-private Connection conn;
-private PreparedStatement ps;
+protected Connection conn;
+protected PreparedStatement ps;
 
 
-private long currentTimeMillis;
+protected long currentTimeMillis;
 
 /**
  * Should this valve set request attributes for IP address, hostname, 
protocol and port used for the request.
@@ -204,7 +205,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @see #setRequestAttributesEnabled(boolean)
  */
-boolean requestAttributesEnabled = true;
+protected boolean requestAttributesEnabled = true;
 
 
 // - Properties
@@ -558,6 +559,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 conn = driver.connect(connectionURL, props);
 conn.setAutoCommit(true);
+prepare();
 String logPattern = pattern;
 if (logPattern.equals("common")) {
 ps = conn.prepareStatement(
@@ -571,6 +573,15 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 }
 
+
+/**
+ * Prepare tables for processing. Used by subclasses for testing.
+ * @throws SQLException if an exception occurs
+ */
+protected void prepare() throws SQLException {
+}
+
+
 /**
  * Close the specified database connection.
  */
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 1c0c143615..4ad96eb661 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -16,9 +16,9 @@
  */
 package org.apache.catalina.valves;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+
 import java.sql.ResultSet;
+im

(tomcat) branch 11.0.x updated: Improve test and extensibility

2024-11-29 Thread remm

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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
 new 9c7dcb1938 Improve test and extensibility
9c7dcb1938 is described below

commit 9c7dcb193870ae62dc043aa6d59b542385d839d8
Author: remm 
AuthorDate: Fri Nov 29 16:38:28 2024 +0100

Improve test and extensibility
---
 .../apache/catalina/valves/JDBCAccessLogValve.java | 59 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 52 ++-
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 8db7569320..590747ac9c 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -100,7 +100,8 @@ import org.apache.tomcat.util.ExceptionUtils;
  * @author Peter Rossbach
  */
 
-public final class JDBCAccessLogValve extends ValveBase implements AccessLog {
+public class JDBCAccessLogValve extends ValveBase implements AccessLog {
+
 
 // --- Constructors
 
@@ -156,47 +157,47 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @since 6.0.15
  */
-boolean useLongContentLength = false;
+protected boolean useLongContentLength = false;
 
 /**
  * The connection username to use when trying to connect to the database.
  */
-String connectionName = null;
+protected String connectionName = null;
 
 
 /**
  * The connection URL to use when trying to connect to the database.
  */
-String connectionPassword = null;
+protected String connectionPassword = null;
 
 /**
  * Instance of the JDBC Driver class we use as a connection factory.
  */
-Driver driver = null;
+protected Driver driver = null;
 
 
-private String driverName;
-private String connectionURL;
-private String tableName;
-private String remoteHostField;
-private String userField;
-private String timestampField;
-private String virtualHostField;
-private String methodField;
-private String queryField;
-private String statusField;
-private String bytesField;
-private String refererField;
-private String userAgentField;
-private String pattern;
-private boolean resolveHosts;
+protected String driverName;
+protected String connectionURL;
+protected String tableName;
+protected String remoteHostField;
+protected String userField;
+protected String timestampField;
+protected String virtualHostField;
+protected String methodField;
+protected String queryField;
+protected String statusField;
+protected String bytesField;
+protected String refererField;
+protected String userAgentField;
+protected String pattern;
+protected boolean resolveHosts;
 
 
-private Connection conn;
-private PreparedStatement ps;
+protected Connection conn;
+protected PreparedStatement ps;
 
 
-private long currentTimeMillis;
+protected long currentTimeMillis;
 
 /**
  * Should this valve set request attributes for IP address, hostname, 
protocol and port used for the request.
@@ -204,7 +205,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @see #setRequestAttributesEnabled(boolean)
  */
-boolean requestAttributesEnabled = true;
+protected boolean requestAttributesEnabled = true;
 
 
 // - Properties
@@ -558,6 +559,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 conn = driver.connect(connectionURL, props);
 conn.setAutoCommit(true);
+prepare();
 String logPattern = pattern;
 if (logPattern.equals("common")) {
 ps = conn.prepareStatement(
@@ -571,6 +573,15 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 }
 
+
+/**
+ * Prepare tables for processing. Used by subclasses for testing.
+ * @throws SQLException if an exception occurs
+ */
+protected void prepare() throws SQLException {
+}
+
+
 /**
  * Close the specified database connection.
  */
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 1c0c143615..4ad96eb661 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -16,9 +16,9 @@
  */
 package org.apache.catalina.valves;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+
 import java.sql.ResultSet;

(tomcat) branch 10.1.x updated: Improve test and extensibility

2024-11-29 Thread remm

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new a0a8dc26ac Improve test and extensibility
a0a8dc26ac is described below

commit a0a8dc26ac61ced7fd2acdd36ddde5a3d9df6ca8
Author: remm 
AuthorDate: Fri Nov 29 16:38:28 2024 +0100

Improve test and extensibility
---
 .../apache/catalina/valves/JDBCAccessLogValve.java | 59 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 52 ++-
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 8db7569320..590747ac9c 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -100,7 +100,8 @@ import org.apache.tomcat.util.ExceptionUtils;
  * @author Peter Rossbach
  */
 
-public final class JDBCAccessLogValve extends ValveBase implements AccessLog {
+public class JDBCAccessLogValve extends ValveBase implements AccessLog {
+
 
 // --- Constructors
 
@@ -156,47 +157,47 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @since 6.0.15
  */
-boolean useLongContentLength = false;
+protected boolean useLongContentLength = false;
 
 /**
  * The connection username to use when trying to connect to the database.
  */
-String connectionName = null;
+protected String connectionName = null;
 
 
 /**
  * The connection URL to use when trying to connect to the database.
  */
-String connectionPassword = null;
+protected String connectionPassword = null;
 
 /**
  * Instance of the JDBC Driver class we use as a connection factory.
  */
-Driver driver = null;
+protected Driver driver = null;
 
 
-private String driverName;
-private String connectionURL;
-private String tableName;
-private String remoteHostField;
-private String userField;
-private String timestampField;
-private String virtualHostField;
-private String methodField;
-private String queryField;
-private String statusField;
-private String bytesField;
-private String refererField;
-private String userAgentField;
-private String pattern;
-private boolean resolveHosts;
+protected String driverName;
+protected String connectionURL;
+protected String tableName;
+protected String remoteHostField;
+protected String userField;
+protected String timestampField;
+protected String virtualHostField;
+protected String methodField;
+protected String queryField;
+protected String statusField;
+protected String bytesField;
+protected String refererField;
+protected String userAgentField;
+protected String pattern;
+protected boolean resolveHosts;
 
 
-private Connection conn;
-private PreparedStatement ps;
+protected Connection conn;
+protected PreparedStatement ps;
 
 
-private long currentTimeMillis;
+protected long currentTimeMillis;
 
 /**
  * Should this valve set request attributes for IP address, hostname, 
protocol and port used for the request.
@@ -204,7 +205,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @see #setRequestAttributesEnabled(boolean)
  */
-boolean requestAttributesEnabled = true;
+protected boolean requestAttributesEnabled = true;
 
 
 // - Properties
@@ -558,6 +559,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 conn = driver.connect(connectionURL, props);
 conn.setAutoCommit(true);
+prepare();
 String logPattern = pattern;
 if (logPattern.equals("common")) {
 ps = conn.prepareStatement(
@@ -571,6 +573,15 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 }
 
+
+/**
+ * Prepare tables for processing. Used by subclasses for testing.
+ * @throws SQLException if an exception occurs
+ */
+protected void prepare() throws SQLException {
+}
+
+
 /**
  * Close the specified database connection.
  */
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 1c0c143615..4ad96eb661 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -16,9 +16,9 @@
  */
 package org.apache.catalina.valves;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+
 import java.sql.ResultSet;

(tomcat) branch 9.0.x updated: Improve test and extensibility

2024-11-29 Thread remm

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

remm 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 1bccd6d977 Improve test and extensibility
1bccd6d977 is described below

commit 1bccd6d977e313f59598269922fedd9df75b9e42
Author: remm 
AuthorDate: Fri Nov 29 16:38:28 2024 +0100

Improve test and extensibility
---
 .../apache/catalina/valves/JDBCAccessLogValve.java | 59 +-
 .../catalina/valves/TestJDBCAccessLogValve.java| 52 ++-
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 6ece27a82f..abd8771bf8 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -100,7 +100,8 @@ import org.apache.tomcat.util.ExceptionUtils;
  * @author Peter Rossbach
  */
 
-public final class JDBCAccessLogValve extends ValveBase implements AccessLog {
+public class JDBCAccessLogValve extends ValveBase implements AccessLog {
+
 
 // --- Constructors
 
@@ -156,47 +157,47 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @since 6.0.15
  */
-boolean useLongContentLength = false;
+protected boolean useLongContentLength = false;
 
 /**
  * The connection username to use when trying to connect to the database.
  */
-String connectionName = null;
+protected String connectionName = null;
 
 
 /**
  * The connection URL to use when trying to connect to the database.
  */
-String connectionPassword = null;
+protected String connectionPassword = null;
 
 /**
  * Instance of the JDBC Driver class we use as a connection factory.
  */
-Driver driver = null;
+protected Driver driver = null;
 
 
-private String driverName;
-private String connectionURL;
-private String tableName;
-private String remoteHostField;
-private String userField;
-private String timestampField;
-private String virtualHostField;
-private String methodField;
-private String queryField;
-private String statusField;
-private String bytesField;
-private String refererField;
-private String userAgentField;
-private String pattern;
-private boolean resolveHosts;
+protected String driverName;
+protected String connectionURL;
+protected String tableName;
+protected String remoteHostField;
+protected String userField;
+protected String timestampField;
+protected String virtualHostField;
+protected String methodField;
+protected String queryField;
+protected String statusField;
+protected String bytesField;
+protected String refererField;
+protected String userAgentField;
+protected String pattern;
+protected boolean resolveHosts;
 
 
-private Connection conn;
-private PreparedStatement ps;
+protected Connection conn;
+protected PreparedStatement ps;
 
 
-private long currentTimeMillis;
+protected long currentTimeMillis;
 
 /**
  * Should this valve set request attributes for IP address, hostname, 
protocol and port used for the request.
@@ -204,7 +205,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
  *
  * @see #setRequestAttributesEnabled(boolean)
  */
-boolean requestAttributesEnabled = true;
+protected boolean requestAttributesEnabled = true;
 
 
 // - Properties
@@ -558,6 +559,7 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 conn = driver.connect(connectionURL, props);
 conn.setAutoCommit(true);
+prepare();
 String logPattern = pattern;
 if (logPattern.equals("common")) {
 ps = conn.prepareStatement(
@@ -571,6 +573,15 @@ public final class JDBCAccessLogValve extends ValveBase 
implements AccessLog {
 }
 }
 
+
+/**
+ * Prepare tables for processing. Used by subclasses for testing.
+ * @throws SQLException if an exception occurs
+ */
+protected void prepare() throws SQLException {
+}
+
+
 /**
  * Close the specified database connection.
  */
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java 
b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
index 621f972c38..acca447510 100644
--- a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -16,9 +16,9 @@
  */
 package org.apache.catalina.valves;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+
 import java.sql.ResultSet;
+

[Bug 65391] Additional user attributes queried by (some) realms

2024-11-29 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Fixed in https://github.com/apache/tomcat/pull/463 for 10.1.0-M11 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

Re: [PR] Introduce Tomcat Source-to-Image (S2I) [tomcat]

2024-11-29 Thread via GitHub



markt-asf commented on PR #188:
URL: https://github.com/apache/tomcat/pull/188#issuecomment-2508119669

   Agree this doesn't belong in the Tomcat source tree.


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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

Re: [PR] Introduce Tomcat Source-to-Image (S2I) [tomcat]

2024-11-29 Thread via GitHub



markt-asf closed pull request #188: Introduce Tomcat Source-to-Image (S2I)
URL: https://github.com/apache/tomcat/pull/188


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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

[PR] fix incorrect partial content response to HEAD request with-Range-header, or from Not-accept-range server [tomcat]

2024-11-29 Thread via GitHub



Chenjp opened a new pull request, #790:
URL: https://github.com/apache/tomcat/pull/790

   - Bug: incorrect partial content response to HEAD request with-Range-header
 ***Tomcat*** - 206:
 ```
   C:\Users\chenjp>curl http://localhost:55263/index.html -i -H "Range: 
bytes=0-10" -I
   HTTP/1.1 206
   vary: accept-encoding
   Accept-Ranges: bytes
   ```
 ***www.apache.org*** offcial site - 200: 
 ```
 C:\Users\chenjp>curl https://www.apache.org -i -H "Range: bytes=0-10" -I
 HTTP/1.1 200 OK
 Connection: keep-alive
 Content-Length: 64483
 ```
   - Bug: receives a partial content sc from a Not-accept-range server
 ```
 C:\Users\chenjp>curl http://localhost:55463/index.html -i -H "Range: 
bytes=0-10"
 HTTP/1.1 206
 vary: accept-encoding
 ETag: W/"957-1732881015126"
 ```
   
   ChangeLog:
   * per RFC 9110 - Section 14, currently GET is the only method.
   * A server that turn off accept-range support should ignore Range header 
field.


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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) 01/02: Prepare for automated formatting

2024-11-29 Thread markt

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

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

commit 2c5d0786422c0ada63b16eedcab069deae966e81
Author: Mark Thomas 
AuthorDate: Fri Nov 29 17:27:28 2024 +

Prepare for automated formatting
---
 java/org/apache/jasper/compiler/Generator.java | 38 +++---
 .../apache/jasper/compiler/JspDocumentParser.java  |  1 +
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 53babe5bfe..12784a46b7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -57,24 +57,10 @@ import org.xml.sax.Attributes;
 /**
  * Generate Java source from Nodes
  *
- * @author Anil K. Vijendran
- * @author Danno Ferrin
- * @author Mandar Raje
- * @author Rajiv Mordani
- * @author Pierre Delisle
- *
- * Tomcat 4.1.x and Tomcat 5:
- * @author Kin-man Chung
- * @author Jan Luehe
- * @author Shawn Bayern
- * @author Mark Roth
- * @author Denis Benoit
- *
- * Tomcat 6.x
- * @author Jacob Hookom
- * @author Remy Maucherat
+ * @author Anil K. Vijendran, Danno Ferrin, Mandar Raje, Rajiv Mordani, Pierre 
Delisle
+ * @author Tomcat 4.1.x and Tomcat 5: Kin-man Chung, Jan Luehe, Shawn Bayern, 
Mark Roth, Denis Benoit
+ * @author Tomcat 6.x: Jacob Hookom, Remy Maucherat
  */
-
 class Generator {
 
 private static final Class[] OBJECT_CLASS = { Object.class };
@@ -410,9 +396,7 @@ class Generator {
 }
 
 /*
- * Generates getters for
- * - instance manager
- * - expression factory
+ * Generates getters for instance manager & expression factory.
  *
  * For JSPs these methods use lazy init. This is not an option for tag 
files
  * (at least it would be more complicated to generate) because the
@@ -484,7 +468,7 @@ class Generator {
  * Generates the _jspInit() method for instantiating the tag handler pools.
  * For tag file, _jspInit has to be invoked manually, and the ServletConfig
  * object explicitly passed.
- *
+ * 
  * In JSP 2.1, we also instantiate an ExpressionFactory
  */
 private void generateInit() {
@@ -654,7 +638,7 @@ class Generator {
  * Declare tag handler pools (tags of the same type and with the same
  * attribute set share the same tag handler pool) (shared by servlet and 
tag
  * handler preamble generation)
- *
+ * 
  * In JSP 2.1, we also scope an instance of ExpressionFactory
  */
 private void genPreambleClassVariableDeclarations() {
@@ -857,9 +841,9 @@ class Generator {
 private void generateXmlProlog(Node.Nodes page) {
 
 /*
- * An XML declaration is generated under the following conditions: -
+ * An XML declaration is generated under the following conditions: a)
  * 'omit-xml-declaration' attribute of  action is set to
- * "no" or "false" - JSP document without a 
+ * "no" or "false"; b) JSP document without a .
  */
 String omitXmlDecl = pageInfo.getOmitXmlDecl();
 if ((omitXmlDecl != null && !JspUtil.booleanValue(omitXmlDecl)) ||
@@ -875,7 +859,6 @@ class Generator {
  * doctype-public appears:  else 
  */
-
 String doctypeName = pageInfo.getDoctypeName();
 if (doctypeName != null) {
 String doctypePublic = pageInfo.getDoctypePublic();
@@ -903,8 +886,11 @@ class Generator {
 
 /*
  * Map containing introspection information on tag handlers:
+ *
  * : tag prefix : Map containing introspection on tag
- * handlers: : tag short name : introspection info of tag
+ * handlers
+ *
+ * : tag short name : introspection info of tag
  * handler for  tag
  */
 private final Map> handlerInfos;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 71f18d991d..fe0c27bf0b 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -496,6 +496,7 @@ class JspDocumentParser
  * and any leading and trailing white-space-only textual nodes in a
  * jsp:attribute whose 'trim' attribute is set to FALSE, which are to
  * be kept verbatim.
+ * 
  * JSP.6.2.3 defines white space characters.
  */
 boolean isAllSpace = true;


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

(tomcat) branch main updated (d14f2021ff -> 1172ed5d6a)

2024-11-29 Thread markt

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

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


from d14f2021ff Remove out-dated references - e.g. to admin app
 new 2c5d078642 Prepare for automated formatting
 new 1172ed5d6a Code clean-up - formatting. No functional change.

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/compiler/Generator.java | 870 -
 .../jasper/compiler/ImplicitTagLibraryInfo.java|  47 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 365 -
 .../apache/jasper/compiler/JarScannerFactory.java  |  12 +-
 java/org/apache/jasper/compiler/JasperTagInfo.java |  29 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |  75 +-
 java/org/apache/jasper/compiler/JspConfig.java | 156 ++--
 .../apache/jasper/compiler/JspDocumentParser.java  | 779 +-
 8 files changed, 824 insertions(+), 1509 deletions(-)


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

(tomcat) 01/02: Prepare for automated formatting

2024-11-29 Thread markt

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

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

commit acf03aeb191aa2a535e1c3c94882b06d8473eb9a
Author: Mark Thomas 
AuthorDate: Fri Nov 29 17:27:28 2024 +

Prepare for automated formatting
---
 java/org/apache/jasper/compiler/Generator.java | 38 +++---
 .../apache/jasper/compiler/JspDocumentParser.java  |  1 +
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 53babe5bfe..12784a46b7 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -57,24 +57,10 @@ import org.xml.sax.Attributes;
 /**
  * Generate Java source from Nodes
  *
- * @author Anil K. Vijendran
- * @author Danno Ferrin
- * @author Mandar Raje
- * @author Rajiv Mordani
- * @author Pierre Delisle
- *
- * Tomcat 4.1.x and Tomcat 5:
- * @author Kin-man Chung
- * @author Jan Luehe
- * @author Shawn Bayern
- * @author Mark Roth
- * @author Denis Benoit
- *
- * Tomcat 6.x
- * @author Jacob Hookom
- * @author Remy Maucherat
+ * @author Anil K. Vijendran, Danno Ferrin, Mandar Raje, Rajiv Mordani, Pierre 
Delisle
+ * @author Tomcat 4.1.x and Tomcat 5: Kin-man Chung, Jan Luehe, Shawn Bayern, 
Mark Roth, Denis Benoit
+ * @author Tomcat 6.x: Jacob Hookom, Remy Maucherat
  */
-
 class Generator {
 
 private static final Class[] OBJECT_CLASS = { Object.class };
@@ -410,9 +396,7 @@ class Generator {
 }
 
 /*
- * Generates getters for
- * - instance manager
- * - expression factory
+ * Generates getters for instance manager & expression factory.
  *
  * For JSPs these methods use lazy init. This is not an option for tag 
files
  * (at least it would be more complicated to generate) because the
@@ -484,7 +468,7 @@ class Generator {
  * Generates the _jspInit() method for instantiating the tag handler pools.
  * For tag file, _jspInit has to be invoked manually, and the ServletConfig
  * object explicitly passed.
- *
+ * 
  * In JSP 2.1, we also instantiate an ExpressionFactory
  */
 private void generateInit() {
@@ -654,7 +638,7 @@ class Generator {
  * Declare tag handler pools (tags of the same type and with the same
  * attribute set share the same tag handler pool) (shared by servlet and 
tag
  * handler preamble generation)
- *
+ * 
  * In JSP 2.1, we also scope an instance of ExpressionFactory
  */
 private void genPreambleClassVariableDeclarations() {
@@ -857,9 +841,9 @@ class Generator {
 private void generateXmlProlog(Node.Nodes page) {
 
 /*
- * An XML declaration is generated under the following conditions: -
+ * An XML declaration is generated under the following conditions: a)
  * 'omit-xml-declaration' attribute of  action is set to
- * "no" or "false" - JSP document without a 
+ * "no" or "false"; b) JSP document without a .
  */
 String omitXmlDecl = pageInfo.getOmitXmlDecl();
 if ((omitXmlDecl != null && !JspUtil.booleanValue(omitXmlDecl)) ||
@@ -875,7 +859,6 @@ class Generator {
  * doctype-public appears:  else 
  */
-
 String doctypeName = pageInfo.getDoctypeName();
 if (doctypeName != null) {
 String doctypePublic = pageInfo.getDoctypePublic();
@@ -903,8 +886,11 @@ class Generator {
 
 /*
  * Map containing introspection information on tag handlers:
+ *
  * : tag prefix : Map containing introspection on tag
- * handlers: : tag short name : introspection info of tag
+ * handlers
+ *
+ * : tag short name : introspection info of tag
  * handler for  tag
  */
 private final Map> handlerInfos;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 71f18d991d..fe0c27bf0b 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -496,6 +496,7 @@ class JspDocumentParser
  * and any leading and trailing white-space-only textual nodes in a
  * jsp:attribute whose 'trim' attribute is set to FALSE, which are to
  * be kept verbatim.
+ * 
  * JSP.6.2.3 defines white space characters.
  */
 boolean isAllSpace = true;


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

(tomcat) branch 11.0.x updated (383b0b83b0 -> 458bb05c6c)

2024-11-29 Thread markt

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

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


from 383b0b83b0 Remove out-dated references - e.g. to admin app
 new acf03aeb19 Prepare for automated formatting
 new 458bb05c6c Code clean-up - formatting. No functional change.

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/compiler/Generator.java | 870 -
 .../jasper/compiler/ImplicitTagLibraryInfo.java|  47 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 365 -
 .../apache/jasper/compiler/JarScannerFactory.java  |  12 +-
 java/org/apache/jasper/compiler/JasperTagInfo.java |  29 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |  75 +-
 java/org/apache/jasper/compiler/JspConfig.java | 156 ++--
 .../apache/jasper/compiler/JspDocumentParser.java  | 779 +-
 8 files changed, 824 insertions(+), 1509 deletions(-)


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

(tomcat) 01/02: Prepare for automated formatting

2024-11-29 Thread markt

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

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

commit 92afb018a10d71fc34456a3fbfe532864f656864
Author: Mark Thomas 
AuthorDate: Fri Nov 29 17:27:28 2024 +

Prepare for automated formatting
---
 java/org/apache/jasper/compiler/Generator.java | 38 +++---
 .../apache/jasper/compiler/JspDocumentParser.java  |  1 +
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 9e228aa19b..e6b7fc90bd 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -59,24 +59,10 @@ import org.xml.sax.Attributes;
 /**
  * Generate Java source from Nodes
  *
- * @author Anil K. Vijendran
- * @author Danno Ferrin
- * @author Mandar Raje
- * @author Rajiv Mordani
- * @author Pierre Delisle
- *
- * Tomcat 4.1.x and Tomcat 5:
- * @author Kin-man Chung
- * @author Jan Luehe
- * @author Shawn Bayern
- * @author Mark Roth
- * @author Denis Benoit
- *
- * Tomcat 6.x
- * @author Jacob Hookom
- * @author Remy Maucherat
+ * @author Anil K. Vijendran, Danno Ferrin, Mandar Raje, Rajiv Mordani, Pierre 
Delisle
+ * @author Tomcat 4.1.x and Tomcat 5: Kin-man Chung, Jan Luehe, Shawn Bayern, 
Mark Roth, Denis Benoit
+ * @author Tomcat 6.x: Jacob Hookom, Remy Maucherat
  */
-
 class Generator {
 
 private final Log log = LogFactory.getLog(Generator.class); // must not be 
static
@@ -414,9 +400,7 @@ class Generator {
 }
 
 /*
- * Generates getters for
- * - instance manager
- * - expression factory
+ * Generates getters for instance manager & expression factory.
  *
  * For JSPs these methods use lazy init. This is not an option for tag 
files
  * (at least it would be more complicated to generate) because the
@@ -488,7 +472,7 @@ class Generator {
  * Generates the _jspInit() method for instantiating the tag handler pools.
  * For tag file, _jspInit has to be invoked manually, and the ServletConfig
  * object explicitly passed.
- *
+ * 
  * In JSP 2.1, we also instantiate an ExpressionFactory
  */
 private void generateInit() {
@@ -658,7 +642,7 @@ class Generator {
  * Declare tag handler pools (tags of the same type and with the same
  * attribute set share the same tag handler pool) (shared by servlet and 
tag
  * handler preamble generation)
- *
+ * 
  * In JSP 2.1, we also scope an instance of ExpressionFactory
  */
 private void genPreambleClassVariableDeclarations() {
@@ -868,9 +852,9 @@ class Generator {
 private void generateXmlProlog(Node.Nodes page) {
 
 /*
- * An XML declaration is generated under the following conditions: -
+ * An XML declaration is generated under the following conditions: a)
  * 'omit-xml-declaration' attribute of  action is set to
- * "no" or "false" - JSP document without a 
+ * "no" or "false"; b) JSP document without a .
  */
 String omitXmlDecl = pageInfo.getOmitXmlDecl();
 if ((omitXmlDecl != null && !JspUtil.booleanValue(omitXmlDecl)) ||
@@ -886,7 +870,6 @@ class Generator {
  * doctype-public appears:  else 
  */
-
 String doctypeName = pageInfo.getDoctypeName();
 if (doctypeName != null) {
 String doctypePublic = pageInfo.getDoctypePublic();
@@ -914,8 +897,11 @@ class Generator {
 
 /*
  * Map containing introspection information on tag handlers:
+ *
  * : tag prefix : Map containing introspection on tag
- * handlers: : tag short name : introspection info of tag
+ * handlers
+ *
+ * : tag short name : introspection info of tag
  * handler for  tag
  */
 private final Map> handlerInfos;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 930cd0da9b..711e3834e4 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -499,6 +499,7 @@ class JspDocumentParser
  * and any leading and trailing white-space-only textual nodes in a
  * jsp:attribute whose 'trim' attribute is set to FALSE, which are to
  * be kept verbatim.
+ * 
  * JSP.6.2.3 defines white space characters.
  */
 boolean isAllSpace = true;


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

(tomcat) branch 10.1.x updated (a664178378 -> c89c5ba09b)

2024-11-29 Thread markt

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

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


from a664178378 Remove out-dated references - e.g. to admin app
 new 92afb018a1 Prepare for automated formatting
 new c89c5ba09b Code clean-up - formatting. No functional change.

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/compiler/Generator.java | 870 -
 .../jasper/compiler/ImplicitTagLibraryInfo.java|  47 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 365 -
 .../apache/jasper/compiler/JarScannerFactory.java  |  12 +-
 java/org/apache/jasper/compiler/JasperTagInfo.java |  29 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |  75 +-
 java/org/apache/jasper/compiler/JspConfig.java | 156 ++--
 .../apache/jasper/compiler/JspDocumentParser.java  | 804 +--
 8 files changed, 827 insertions(+), 1531 deletions(-)


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

Buildbot failure in on tomcat-11.0.x

2024-11-29 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1419
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 11.0.x] 9c7dcb193870ae62dc043aa6d59b542385d839d8


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  shell_6: 0

  compile: 1

  shell_7: 0

  shell_8: 0

  shell_9: 0

  shell_10: 0

  Rsync docs to nightlies.apache.org: 0

  shell_11: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_12: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

[PR] Reject Range-Request if those ranges are not strictly in ascending order [tomcat]

2024-11-29 Thread via GitHub



Chenjp opened a new pull request, #791:
URL: https://github.com/apache/tomcat/pull/791

   Request that ranges are not strictly in ascending order, indicates either a 
broken client or a deliberate denial-of-service attack.


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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

(tomcat) branch 9.0.x updated (64d11738b0 -> 0d2794e5bc)

2024-11-29 Thread markt

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

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


from 64d11738b0 Remove out-dated references - e.g. to admin app
 new dafbcac8c7 Prepare for automated formatting
 new 0d2794e5bc Code clean-up - formatting. No functional change.

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/compiler/Generator.java | 950 -
 .../jasper/compiler/ImplicitTagLibraryInfo.java|  47 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 361 
 .../apache/jasper/compiler/JarScannerFactory.java  |  12 +-
 java/org/apache/jasper/compiler/JasperTagInfo.java |  29 +-
 .../apache/jasper/compiler/JavacErrorDetail.java   |  75 +-
 java/org/apache/jasper/compiler/JspConfig.java | 149 ++--
 .../apache/jasper/compiler/JspDocumentParser.java  | 804 +
 8 files changed, 850 insertions(+), 1577 deletions(-)


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

(tomcat) 01/02: Prepare for automated formatting

2024-11-29 Thread markt

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

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

commit dafbcac8c795311feb38f1ec47fd8665a2d17580
Author: Mark Thomas 
AuthorDate: Fri Nov 29 17:27:28 2024 +

Prepare for automated formatting
---
 java/org/apache/jasper/compiler/Generator.java | 40 +++---
 .../apache/jasper/compiler/JspDocumentParser.java  |  1 +
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index 9423395659..f34e7fb1e6 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -59,24 +59,10 @@ import org.xml.sax.Attributes;
 /**
  * Generate Java source from Nodes
  *
- * @author Anil K. Vijendran
- * @author Danno Ferrin
- * @author Mandar Raje
- * @author Rajiv Mordani
- * @author Pierre Delisle
- *
- * Tomcat 4.1.x and Tomcat 5:
- * @author Kin-man Chung
- * @author Jan Luehe
- * @author Shawn Bayern
- * @author Mark Roth
- * @author Denis Benoit
- *
- * Tomcat 6.x
- * @author Jacob Hookom
- * @author Remy Maucherat
+ * @author Anil K. Vijendran, Danno Ferrin, Mandar Raje, Rajiv Mordani, Pierre 
Delisle
+ * @author Tomcat 4.1.x and Tomcat 5: Kin-man Chung, Jan Luehe, Shawn Bayern, 
Mark Roth, Denis Benoit
+ * @author Tomcat 6.x: Jacob Hookom, Remy Maucherat
  */
-
 class Generator {
 
 private static final Class[] OBJECT_CLASS = { Object.class };
@@ -428,9 +414,7 @@ class Generator {
 }
 
 /*
- * Generates getters for
- * - instance manager
- * - expression factory
+ * Generates getters for instance manager & expression factory.
  *
  * For JSPs these methods use lazy init. This is not an option for tag 
files
  * (at least it would be more complicated to generate) because the
@@ -502,7 +486,7 @@ class Generator {
  * Generates the _jspInit() method for instantiating the tag handler pools.
  * For tag file, _jspInit has to be invoked manually, and the ServletConfig
  * object explicitly passed.
- *
+ * 
  * In JSP 2.1, we also instantiate an ExpressionFactory
  */
 private void generateInit() {
@@ -672,7 +656,7 @@ class Generator {
  * Declare tag handler pools (tags of the same type and with the same
  * attribute set share the same tag handler pool) (shared by servlet and 
tag
  * handler preamble generation)
- *
+ * 
  * In JSP 2.1, we also scope an instance of ExpressionFactory
  */
 private void genPreambleClassVariableDeclarations() {
@@ -866,9 +850,9 @@ class Generator {
 private void generateXmlProlog(Node.Nodes page) {
 
 /*
- * An XML declaration is generated under the following conditions: -
+ * An XML declaration is generated under the following conditions: a)
  * 'omit-xml-declaration' attribute of  action is set to
- * "no" or "false" - JSP document without a 
+ * "no" or "false"; b) JSP document without a .
  */
 String omitXmlDecl = pageInfo.getOmitXmlDecl();
 if ((omitXmlDecl != null && !JspUtil.booleanValue(omitXmlDecl)) ||
@@ -884,7 +868,6 @@ class Generator {
  * doctype-public appears:  else 
  */
-
 String doctypeName = pageInfo.getDoctypeName();
 if (doctypeName != null) {
 String doctypePublic = pageInfo.getDoctypePublic();
@@ -912,8 +895,11 @@ class Generator {
 
 /*
  * Hashtable containing introspection information on tag handlers:
- * : tag prefix : hashtable containing introspection on tag
- * handlers: : tag short name : introspection info of tag
+ *
+ * : tag prefix : Map containing introspection on tag
+ * handlers
+ *
+ * : tag short name : introspection info of tag
  * handler for  tag
  */
 private final Map> handlerInfos;
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index 054b939a28..907346c67e 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -497,6 +497,7 @@ class JspDocumentParser
  * and any leading and trailing white-space-only textual nodes in a
  * jsp:attribute whose 'trim' attribute is set to FALSE, which are to
  * be kept verbatim.
+ * 
  * JSP.6.2.3 defines white space characters.
  */
 boolean isAllSpace = true;


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

Re: [PR] Reject Range-Request if those ranges are not strictly in ascending order [tomcat]

2024-11-29 Thread via GitHub



Chenjp commented on PR #791:
URL: https://github.com/apache/tomcat/pull/791#issuecomment-2508272217

   simpler and elegant logic to detect both overlap and ASC order in same time.


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

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

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


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

Buildbot failure in on tomcat-9.0.x

2024-11-29 Thread buildbot

Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1195
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 0d2794e5bcd88f7ce0409ac1fb46decf5e905e82


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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

40 matches

Mail list logo