date:20250619

svn commit: r1926589 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

2025-06-19 Thread schultz

Author: schultz
Date: Thu Jun 19 21:49:32 2025
New Revision: 1926589

URL: http://svn.apache.org/viewvc?rev=1926589&view=rev
Log:
Update PMC chair position.

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1926589&r1=1926588&r2=1926589&view=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Jun 19 21:49:32 2025
@@ -33,7 +33,7 @@ A complete list of all the Apache Commit
 PMC Members & 
Committers
 
 PMC Chair
-Mladen Turk (mturk at apache.org)
+Christopher Schultz (schultz at apache.org)
 
 
 PMC Members & Committers
@@ -125,9 +125,6 @@ A complete list of all the Apache Commit
 Igal Sapir (isapir at apache.org)
 
 
-Christopher Schultz (schultz at apache.org)
-
-
 Felix Schumacher (fschumacher at apache.org)
 
 
@@ -167,6 +164,7 @@ Emeritus is defined in the Apache gl
 Glenn Nielsen (glenn at apache.org)
 Amy Roh (amyroh at apache.org)
 Yoav Shapira (yoavs at apache.org)
+Mladen Turk (mturk at apache.org)
 
 André Warnier (soliplaya at apache.org)
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1926589&r1=1926588&r2=1926589&view=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Thu Jun 19 21:49:32 2025
@@ -43,7 +43,7 @@ A complete list of all the Apache Commit
 
 
 PMC Chair
-Mladen Turk (mturk at apache.org)
+Christopher Schultz (schultz at apache.org)
 
 
 PMC Members & Committers
@@ -135,9 +135,6 @@ A complete list of all the Apache Commit
 Igal Sapir (isapir at apache.org)
 
 
-Christopher Schultz (schultz at apache.org)
-
-
 Felix Schumacher (fschumacher at apache.org)
 
 
@@ -179,6 +176,7 @@ Emeritus is defined in the Apache gl
 Glenn Nielsen (glenn at apache.org)
 Amy Roh (amyroh at apache.org)
 Yoav Shapira (yoavs at apache.org)
+Mladen Turk (mturk at apache.org)

Re: Bugzilla now requires authentication

2025-06-19 Thread Mark Thomas


On 19/06/2025 15:10, Mark Thomas wrote:

All,

The Tomcat project has been using Bugzilla to track issues for more than 
20 years.


Recently there has been a significant increase in abusive traffic 
targetting the ASF's Bugzilla instances - mostly AI scraping.


To protect the ASF Bugzilla instances and ensure that they remain usable 
for the community, the ASF has - with regret - configured all ASF 
Bugzilla instances to require authentication in order to access them.


If you need to search bugs, view a bug report, report a bug or otherwise 
interact with Bugzilla, you will need to login in first. If you don't 
have an ASF Bugzilla account, the link to create one is on the front page.


:(

While requiring authentication was a quick short term solution, some 
longer term solutions were discussed which includes migrating away from 
BugZilla. If we did so, GitHub issues is the obvious destination.


When we last discussed moving to GitHub issues in 2022 [1] the consensus 
was not to. Has that view changed since then?


I have no strong preference for either. My concerns are more around if 
we migrated, what would we migrate and how would we do it. We have a 
*lot* of historical data. We have a couple of smaller projects we can 
use to test any migration if we decide to go that way.


Mark



[1] https://lists.apache.org/thread/9dstc1j7ld1ol3rbm5zpm8wnx29jyold

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

Re: [PR] Discard unsupported part header field while handling multipart fileupload request [tomcat]

2025-06-19 Thread via GitHub



ChristopherSchultz closed pull request #869: Discard unsupported part header 
field while handling multipart fileupload request
URL: https://github.com/apache/tomcat/pull/869


-- 
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] Discard unsupported part header field while handling multipart fileupload request [tomcat]

2025-06-19 Thread via GitHub



ChristopherSchultz commented on PR #869:
URL: https://github.com/apache/tomcat/pull/869#issuecomment-2988597530

   I've got bad news: this code is a packaged-renamed copy of Apache 
commons-fileupload, so this PR actually should be re-worked and filed against 
that project instead. We are downstream of commons-fileupload.
   
   The good news is that the changes should be almost identical, but the file 
paths will be different.


-- 
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: Bugzilla now requires authentication

2025-06-19 Thread Christopher Schultz


Mark,

On 6/19/25 10:43 AM, Mark Thomas wrote:

On 19/06/2025 15:10, Mark Thomas wrote:

All,

The Tomcat project has been using Bugzilla to track issues for more 
than 20 years.


Recently there has been a significant increase in abusive traffic 
targetting the ASF's Bugzilla instances - mostly AI scraping.


To protect the ASF Bugzilla instances and ensure that they remain 
usable for the community, the ASF has - with regret - configured all 
ASF Bugzilla instances to require authentication in order to access them.


If you need to search bugs, view a bug report, report a bug or 
otherwise interact with Bugzilla, you will need to login in first. If 
you don't have an ASF Bugzilla account, the link to create one is on 
the front page.


:(

While requiring authentication was a quick short term solution, some 
longer term solutions were discussed which includes migrating away from 
BugZilla. If we did so, GitHub issues is the obvious destination.


I guess maybe I don't understand the issue. BZ always required an 
account to write, and anyone could register for an account. A small 
hurdle, but present. The same is true for GitHub.


I'm not sure why we care about AI scrapers, given that all the mailing 
lists and source code are also public. Everything produced by the ASF 
and its committers over the years has already been stolen and had 
whatever IP protections it had stripped and thrown into a big blender.


How does requiring a login to BZ to even *see* the bugs change anything? 
Or is this an issue of scale? AI scrapers want to pull every bug for the 
past 20 years and it's killing the service? And GitHub just has 
effectively-infinite resources?


When we last discussed moving to GitHub issues in 2022 [1] the consensus 
was not to. Has that view changed since then?


I have no strong preference for either. My concerns are more around if 
we migrated, what would we migrate and how would we do it. We have a 
*lot* of historical data. We have a couple of smaller projects we can 
use to test any migration if we decide to go that way.


I have no particular preference. GH integrates nicely with PRs and all 
of that. If we move to anything, I'd say GH is the way to go. I find 
JIRA to be insufferable for some reason.


-chris


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

[PR] Avoid to change the status of the response in StandardHostValve.java … [tomcat]

2025-06-19 Thread via GitHub



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

   …if response is committed
   
   main issue: you get a 500 in the access log whereas it was a 200 (for 
example)


-- 
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 main updated: Add null coalescing operator to comment

2025-06-19 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 6839d80f52 Add null coalescing operator to comment
6839d80f52 is described below

commit 6839d80f526e8198130b2523425bf019d445ae4d
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:33:24 2025 +0100

Add null coalescing operator to comment
---
 java/org/apache/el/parser/ELParser.jjt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index 7879fd7e5e..982dc4e38c 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -148,7 +148,7 @@ void LambdaExpressionOrInvocation() #LambdaExpression : {}
 
 /*
  * Ternary
- * For '?:' '? :', then Or
+ * For '??' '?:' '? :', then Or
  */
 void Ternary() : {}
 {


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

[PR] Discard unsupported part header field while handling multipart fileupload request [tomcat]

2025-06-19 Thread via GitHub



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

   comply rfc7578 section 
[4.8](https://datatracker.ietf.org/doc/html/rfc7578#section-4.8)
   ```
   4.8.  Other "Content-" Header Fields
  The multipart/form-data media type does not support any MIME header
  fields in parts other than Content-Type, Content-Disposition, and (in
  limited circumstances) Content-Transfer-Encoding.  Other header
  fields MUST NOT be included and MUST be ignored.
   ```
   Only listed part header fields are supported. ignore others.


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

2025-06-19 Thread buildbot

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


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

  shell_7: 0

  compile: 1

  shell_8: 0

  shell_9: 0

  shell_10: 0

  shell_11: 0

  Rsync docs to nightlies.apache.org: 0

  shell_12: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

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

(tomcat) branch 10.1.x updated: Remove the unused INSTANCEOF and FUNCTIONSUFFIX

2025-06-19 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 7e0c97a9a9 Remove the unused INSTANCEOF and FUNCTIONSUFFIX
7e0c97a9a9 is described below

commit 7e0c97a9a932764f6d8acd3e9d323ca601047b8c
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:13:00 2025 +0100

Remove the unused INSTANCEOF and FUNCTIONSUFFIX
---
 java/org/apache/el/parser/ELParser.java|  21 +-
 java/org/apache/el/parser/ELParser.jjt |   2 -
 java/org/apache/el/parser/ELParserConstants.java   |  39 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 951 ++---
 4 files changed, 276 insertions(+), 737 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index e9e66409bc..647569b3e5 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -3436,9 +3436,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_247_9_71() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(51)) {
+if (jj_scan_token(50)) {
 jj_scanpos = xsp;
-if (jj_scan_token(52)) {
+if (jj_scan_token(51)) {
 return true;
 }
 }
@@ -3451,9 +3451,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_245_9_70() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(49)) {
+if (jj_scan_token(48)) {
 jj_scanpos = xsp;
-if (jj_scan_token(50)) {
+if (jj_scan_token(49)) {
 return true;
 }
 }
@@ -3910,11 +3910,10 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 
 private static void jj_la1_init_1() {
-jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0, 
0x100, 0x100, 0x1008860, 0x0, 0x600,
-0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 
0x0, 0x0, 0x1, 0x0, 0x1, 0x20,
-0xc000, 0xc000, 0x1e2000, 0x6, 0x18, 0x1e2000, 0x60, 
0x60, 0x8000, 0x1000860, 0x0, 0x100,
-0x0, 0x0, 0x0, 0x1008860, 0x0, 0x100, 0x0, 0x0, 0x1008860, 
0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0,
-0x0, 0x0, };
+jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x804860, 0x804860, 0x0, 
0x80, 0x80, 0x804860, 0x0, 0x600, 0x600,
+0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 0x0, 
0x0, 0x1, 0x0, 0x1, 0x10, 0x6000,
+0x6000, 0xf1000, 0x3, 0xc, 0xf1000, 0x60, 0x60, 
0x4000, 0x800860, 0x0, 0x80, 0x0, 0x0, 0x0,
+0x804860, 0x0, 0x80, 0x0, 0x0, 0x804860, 0x0, 0x804860, 
0x0, 0x804860, 0x0, 0x0, 0x0, 0x0, };
 }
 
 final private JJCalls[] jj_2_rtns = new JJCalls[9];
@@ -4189,7 +4188,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[61];
+boolean[] la1tokens = new boolean[59];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4205,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 61; i++) {
+for (int i = 0; i < 59; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index 0d9a79fbe6..34eb89416e 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -535,7 +535,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< OR0 : "||" >
 |< OR1 : "or" >
 |< EMPTY : "empty" >
-|< INSTANCEOF : "instanceof" >
 |< MULT : "*" >
 |< PLUS : "+" >
 |< MINUS : "-" >
@@ -548,7 +547,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< ASSIGN : "=" >
 |< ARROW : "->" >
 |< IDENTIFIER :  (|)* >
-|< FUNCTIONSUFFIX : () >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index 82d6364fab..5de49226c5 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -88,39 +88,35 @@ public interface ELParserConstants {
 /** RegularExpression Id. */
 int EMPTY = 43;
 /** RegularExpression Id. */
-int

(tomcat) branch 9.0.x updated: Remove the unused INSTANCEOF and FUNCTIONSUFFIX

2025-06-19 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 882b445ab8 Remove the unused INSTANCEOF and FUNCTIONSUFFIX
882b445ab8 is described below

commit 882b445ab82efd9fc24d0f94079b50d6aa4dfc99
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:15:56 2025 +0100

Remove the unused INSTANCEOF and FUNCTIONSUFFIX
---
 java/org/apache/el/parser/ELParser.java|  21 +-
 java/org/apache/el/parser/ELParser.jjt |   2 -
 java/org/apache/el/parser/ELParserConstants.java   |  39 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 951 ++---
 webapps/docs/changelog.xml |   4 +
 5 files changed, 280 insertions(+), 737 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 3d2bbcb4cd..90572f7b41 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -3436,9 +3436,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_247_9_71() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(51)) {
+if (jj_scan_token(50)) {
 jj_scanpos = xsp;
-if (jj_scan_token(52)) {
+if (jj_scan_token(51)) {
 return true;
 }
 }
@@ -3451,9 +3451,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_245_9_70() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(49)) {
+if (jj_scan_token(48)) {
 jj_scanpos = xsp;
-if (jj_scan_token(50)) {
+if (jj_scan_token(49)) {
 return true;
 }
 }
@@ -3910,11 +3910,10 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 
 private static void jj_la1_init_1() {
-jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0, 
0x100, 0x100, 0x1008860, 0x0, 0x600,
-0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 
0x0, 0x0, 0x1, 0x0, 0x1, 0x20,
-0xc000, 0xc000, 0x1e2000, 0x6, 0x18, 0x1e2000, 0x60, 
0x60, 0x8000, 0x1000860, 0x0, 0x100,
-0x0, 0x0, 0x0, 0x1008860, 0x0, 0x100, 0x0, 0x0, 0x1008860, 
0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0,
-0x0, 0x0, };
+jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x804860, 0x804860, 0x0, 
0x80, 0x80, 0x804860, 0x0, 0x600, 0x600,
+0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 0x0, 
0x0, 0x1, 0x0, 0x1, 0x10, 0x6000,
+0x6000, 0xf1000, 0x3, 0xc, 0xf1000, 0x60, 0x60, 
0x4000, 0x800860, 0x0, 0x80, 0x0, 0x0, 0x0,
+0x804860, 0x0, 0x80, 0x0, 0x0, 0x804860, 0x0, 0x804860, 
0x0, 0x804860, 0x0, 0x0, 0x0, 0x0, };
 }
 
 final private JJCalls[] jj_2_rtns = new JJCalls[9];
@@ -4189,7 +4188,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[61];
+boolean[] la1tokens = new boolean[59];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4205,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 61; i++) {
+for (int i = 0; i < 59; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index fca64c0408..60e8549a0a 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -535,7 +535,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< OR0 : "||" >
 |< OR1 : "or" >
 |< EMPTY : "empty" >
-|< INSTANCEOF : "instanceof" >
 |< MULT : "*" >
 |< PLUS : "+" >
 |< MINUS : "-" >
@@ -548,7 +547,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< ASSIGN : "=" >
 |< ARROW : "->" >
 |< IDENTIFIER :  (|)* >
-|< FUNCTIONSUFFIX : () >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index 82d6364fab..5de49226c5 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -88,39 +88,35 @@ public interface ELParserConstants {
 /** RegularExpression Id. */

(tomcat) branch 10.1.x updated: Add change log entry

2025-06-19 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 9a0d6915b3 Add change log entry
9a0d6915b3 is described below

commit 9a0d6915b3236ef1a7e34c040a4e7cd7914d5629
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:16:26 2025 +0100

Add change log entry
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b838ff4003..762bd1a2fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
 Remove IMPL_OBJ_START from EL grammar for
 IDENTIFIER. (markt)
   
+  
+Remove the INSTANCEOF and FUNCTIONSUFFIX
+definitions from the EL grammar as both are unused. (markt)
+  
 
   
   


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

Buildbot failure in on tomcat-9.0.x

2025-06-19 Thread buildbot

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


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

(tomcat) branch main updated: Remove the unused INSTANCEOF and FUNCTIONSUFFIX

2025-06-19 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 b8086aa9ea Remove the unused INSTANCEOF and FUNCTIONSUFFIX
b8086aa9ea is described below

commit b8086aa9eaf0eafce59cca6b960f6b5a6f2a25b2
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:04:36 2025 +0100

Remove the unused INSTANCEOF and FUNCTIONSUFFIX
---
 java/org/apache/el/parser/ELParser.java|  22 +-
 java/org/apache/el/parser/ELParser.jjt |   2 -
 java/org/apache/el/parser/ELParserConstants.java   |  39 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 951 ++---
 webapps/docs/changelog.xml |   4 +
 5 files changed, 281 insertions(+), 737 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index c3dcdfb143..808814754a 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -3537,9 +3537,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_254_9_73() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(51)) {
+if (jj_scan_token(50)) {
 jj_scanpos = xsp;
-if (jj_scan_token(52)) {
+if (jj_scan_token(51)) {
 return true;
 }
 }
@@ -3552,9 +3552,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_252_9_72() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(49)) {
+if (jj_scan_token(48)) {
 jj_scanpos = xsp;
-if (jj_scan_token(50)) {
+if (jj_scan_token(49)) {
 return true;
 }
 }
@@ -4056,11 +4056,11 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 
 private static void jj_la1_init_1() {
-jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0, 
0x100, 0x100, 0x1008860, 0x0, 0x1,
-0x1, 0x600, 0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 
0x18, 0x1e, 0x1, 0x0, 0x0, 0x1, 0x0, 0x1,
-0x20, 0xc000, 0xc000, 0x1e2000, 0x6, 0x18, 
0x1e2000, 0x60, 0x60, 0x8000, 0x1000860, 0x0,
-0x100, 0x0, 0x0, 0x0, 0x1008860, 0x0, 0x100, 0x0, 0x0, 
0x1008860, 0x0, 0x1008860, 0x0,
-0x1008860, 0x0, 0x0, 0x0, 0x0, };
+jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x804860, 0x804860, 0x0, 
0x80, 0x80, 0x804860, 0x0, 0x8000,
+0x8000, 0x600, 0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 
0x18, 0x1e, 0x1, 0x0, 0x0, 0x1, 0x0, 0x1,
+0x10, 0x6000, 0x6000, 0xf1000, 0x3, 0xc, 0xf1000, 
0x60, 0x60, 0x4000, 0x800860, 0x0,
+0x80, 0x0, 0x0, 0x0, 0x804860, 0x0, 0x80, 0x0, 0x0, 
0x804860, 0x0, 0x804860, 0x0, 0x804860, 0x0,
+0x0, 0x0, 0x0, };
 }
 
 final private JJCalls[] jj_2_rtns = new JJCalls[10];
@@ -4335,7 +4335,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[61];
+boolean[] la1tokens = new boolean[59];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4352,7 +4352,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 61; i++) {
+for (int i = 0; i < 59; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index e8610ad129..7879fd7e5e 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -542,7 +542,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< OR0 : "||" >
 |< OR1 : "or" >
 |< EMPTY : "empty" >
-|< INSTANCEOF : "instanceof" >
 |< MULT : "*" >
 |< PLUS : "+" >
 |< MINUS : "-" >
@@ -555,7 +554,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< ASSIGN : "=" >
 |< ARROW : "->" >
 |< IDENTIFIER :  (|)* >
-|< FUNCTIONSUFFIX : () >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index 82d6364fab..5de49226c5 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -88,39 +88,35 @@ public interface ELParserC

Re: Bugzilla now requires authentication

2025-06-19 Thread Emmanuel Bourg


On 19/06/2025 16:43, Mark Thomas wrote:

While requiring authentication was a quick short term solution, some 
longer term solutions were discussed which includes migrating away from 
BugZilla. If we did so, GitHub issues is the obvious destination.


When we last discussed moving to GitHub issues in 2022 [1] the consensus 
was not to. Has that view changed since then?


It looks like the Maven project is doing so currently, migrating away 
from JIRA. But GitHub isn't free from spam, some projects are even the 
target of realistic AI generated reports, I don't think we've received 
such reports in Bugzilla yet.


The question is, do we want to sacrifice a bit of our independence to 
align the project with the current development practices set by GitHub? 
And would we see the things differently if the ASF had a GitLab or Gitea 
instance that could provide an experience similar to GitHub but self 
hosted? I think this option would have my preference.


Emmanuel Bourg

-
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: Remove the unused INSTANCEOF and FUNCTIONSUFFIX

2025-06-19 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 ae6d2206c9 Remove the unused INSTANCEOF and FUNCTIONSUFFIX
ae6d2206c9 is described below

commit ae6d2206c9988bb13ffb370430af00a2a2d03ead
Author: Mark Thomas 
AuthorDate: Thu Jun 19 16:08:58 2025 +0100

Remove the unused INSTANCEOF and FUNCTIONSUFFIX
---
 java/org/apache/el/parser/ELParser.java|  21 +-
 java/org/apache/el/parser/ELParser.jjt |   2 -
 java/org/apache/el/parser/ELParserConstants.java   |  39 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 951 ++---
 webapps/docs/changelog.xml |   4 +
 5 files changed, 280 insertions(+), 737 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index e9e66409bc..647569b3e5 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -3436,9 +3436,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_247_9_71() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(51)) {
+if (jj_scan_token(50)) {
 jj_scanpos = xsp;
-if (jj_scan_token(52)) {
+if (jj_scan_token(51)) {
 return true;
 }
 }
@@ -3451,9 +3451,9 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 private boolean jj_3R_Multiplication_245_9_70() {
 Token xsp;
 xsp = jj_scanpos;
-if (jj_scan_token(49)) {
+if (jj_scan_token(48)) {
 jj_scanpos = xsp;
-if (jj_scan_token(50)) {
+if (jj_scan_token(49)) {
 return true;
 }
 }
@@ -3910,11 +3910,10 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 
 private static void jj_la1_init_1() {
-jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0, 
0x100, 0x100, 0x1008860, 0x0, 0x600,
-0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 
0x0, 0x0, 0x1, 0x0, 0x1, 0x20,
-0xc000, 0xc000, 0x1e2000, 0x6, 0x18, 0x1e2000, 0x60, 
0x60, 0x8000, 0x1000860, 0x0, 0x100,
-0x0, 0x0, 0x0, 0x1008860, 0x0, 0x100, 0x0, 0x0, 0x1008860, 
0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0,
-0x0, 0x0, };
+jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x804860, 0x804860, 0x0, 
0x80, 0x80, 0x804860, 0x0, 0x600, 0x600,
+0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 0x0, 
0x0, 0x1, 0x0, 0x1, 0x10, 0x6000,
+0x6000, 0xf1000, 0x3, 0xc, 0xf1000, 0x60, 0x60, 
0x4000, 0x800860, 0x0, 0x80, 0x0, 0x0, 0x0,
+0x804860, 0x0, 0x80, 0x0, 0x0, 0x804860, 0x0, 0x804860, 
0x0, 0x804860, 0x0, 0x0, 0x0, 0x0, };
 }
 
 final private JJCalls[] jj_2_rtns = new JJCalls[9];
@@ -4189,7 +4188,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[61];
+boolean[] la1tokens = new boolean[59];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4205,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 61; i++) {
+for (int i = 0; i < 59; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index 10e7b94561..cd1975481a 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -535,7 +535,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< OR0 : "||" >
 |< OR1 : "or" >
 |< EMPTY : "empty" >
-|< INSTANCEOF : "instanceof" >
 |< MULT : "*" >
 |< PLUS : "+" >
 |< MINUS : "-" >
@@ -548,7 +547,6 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< ASSIGN : "=" >
 |< ARROW : "->" >
 |< IDENTIFIER :  (|)* >
-|< FUNCTIONSUFFIX : () >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index 82d6364fab..5de49226c5 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -88,39 +88,35 @@ public interface ELParserConstants {
 /** RegularExpression Id. */

Bugzilla now requires authentication

2025-06-19 Thread Mark Thomas


All,

The Tomcat project has been using Bugzilla to track issues for more than 
20 years.


Recently there has been a significant increase in abusive traffic 
targetting the ASF's Bugzilla instances - mostly AI scraping.


To protect the ASF Bugzilla instances and ensure that they remain usable 
for the community, the ASF has - with regret - configured all ASF 
Bugzilla instances to require authentication in order to access them.


If you need to search bugs, view a bug report, report a bug or otherwise 
interact with Bugzilla, you will need to login in first. If you don't 
have an ASF Bugzilla account, the link to create one is on the front page.


Mark


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

Buildbot success in on tomcat-11.0.x

2025-06-19 Thread buildbot

Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/1709
Blamelist: Mark Thomas , remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 11.0.x] ae6d2206c9988bb13ffb370430af00a2a2d03ead


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

  shell_7: 0

  compile: 1

  shell_8: 0

  shell_9: 0

  shell_10: 0

  shell_11: 0

  Rsync docs to nightlies.apache.org: 0

  shell_12: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

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

(tomcat) branch 11.0.x updated: Fix JMX value for keepAliveCount

2025-06-19 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 2fff6a8c7b Fix JMX value for keepAliveCount
2fff6a8c7b is described below

commit 2fff6a8c7be2d2028d8dbd9c1c3fd3da6c2a78ed
Author: remm 
AuthorDate: Thu Jun 19 12:32:39 2025 +0200

Fix JMX value for keepAliveCount

keepAliveCount should mostly reflect the amount of keys in the selector,
rather than something more complicated.
Add useVirtualThreads flag value to JMX.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java   | 2 +-
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index f6ef6a5b30..62bcae1a30 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -634,7 +634,7 @@ public class NioEndpoint extends 
AbstractNetworkChannelEndpoint
 
+
+
 
   868 by
 qingdaoheze. (markt)
   
+  
+Fix JMX value for keepAliveCount on the endpoint. Also add
+the value of useVirtualThreads in JMX. (remm)
+  
 
   
   


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

(tomcat) branch 9.0.x updated: Fix JMX value for keepAliveCount

2025-06-19 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 2fe2368792 Fix JMX value for keepAliveCount
2fe2368792 is described below

commit 2fe23687926ccb2ba004106d8a978569f522d2c5
Author: remm 
AuthorDate: Thu Jun 19 12:32:39 2025 +0200

Fix JMX value for keepAliveCount

keepAliveCount should mostly reflect the amount of keys in the selector,
rather than something more complicated.
Add useVirtualThreads flag value to JMX.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java   | 2 +-
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 810accbe26..dc211dfd03 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -660,7 +660,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 }
 
 public int getKeyCount() {
-return keyCount;
+return selector.keys().size();
 }
 
 public Selector getSelector() {
diff --git a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml 
b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
index 0216cb1442..69e620977f 100644
--- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
+++ b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
@@ -162,6 +162,9 @@
 
 
+
+
 
   868 by
 qingdaoheze. (markt)
   
+  
+Fix JMX value for keepAliveCount on the endpoint. Also add
+the value of useVirtualThreads in JMX. (remm)
+  
 
   
   


-
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: Fix JMX value for keepAliveCount

2025-06-19 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 8d98946e78 Fix JMX value for keepAliveCount
8d98946e78 is described below

commit 8d98946e78adc7417caac4ae583033435652235a
Author: remm 
AuthorDate: Thu Jun 19 12:32:39 2025 +0200

Fix JMX value for keepAliveCount

keepAliveCount should mostly reflect the amount of keys in the selector,
rather than something more complicated.
Add useVirtualThreads flag value to JMX.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java   | 2 +-
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index cb067a1e88..c0bf7fd974 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -629,7 +629,7 @@ public class NioEndpoint extends 
AbstractJsseEndpoint
 }
 
 public int getKeyCount() {
-return keyCount;
+return selector.keys().size();
 }
 
 public Selector getSelector() {
diff --git a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml 
b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
index d5e52527db..2ff1cda6b5 100644
--- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
+++ b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
@@ -151,6 +151,9 @@
 
 
+
+
 
   868 by
 qingdaoheze. (markt)
   
+  
+Fix JMX value for keepAliveCount on the endpoint. Also add
+the value of useVirtualThreads in JMX. (remm)
+  
 
   
   


-
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: Consistent method names and fix typo

2025-06-19 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 a4d1cb4fe6 Consistent method names and fix typo
a4d1cb4fe6 is described below

commit a4d1cb4fe6f8b1774f3a8eefc22febeb5141b4a9
Author: Mark Thomas 
AuthorDate: Thu Jun 19 09:45:33 2025 +0100

Consistent method names and fix typo
---
 test/org/apache/el/parser/TesterGenerateIdentifierRanges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java 
b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
index 97f463a8b1..c5ed7dafc8 100644
--- a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
+++ b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
@@ -61,11 +61,11 @@ public class TesterGenerateIdentifierRanges {
 
 
 /*
- * Java Digit is all characters where Character.isJavaIdentifierPart(0 
returns true that aren't included in Java
+ * Java Digit is all characters where Character.isJavaIdentifierPart() 
returns true that aren't included in Java
  * Letter.
  */
 @Test
-public void testJavaDigitRanges() {
+public void testGenerateJavaDigitRanges() {
 int start = 0;
 int end = 0;
 boolean inRange = false;


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

(tomcat) branch main updated: Consistent method names and fix typo

2025-06-19 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 5116bb4d9d Consistent method names and fix typo
5116bb4d9d is described below

commit 5116bb4d9da65cdfdb8f62aeaabacc7804fe0392
Author: Mark Thomas 
AuthorDate: Thu Jun 19 09:45:33 2025 +0100

Consistent method names and fix typo
---
 test/org/apache/el/parser/TesterGenerateIdentifierRanges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java 
b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
index 6ac9bd7adc..6229524c8c 100644
--- a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
+++ b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
@@ -61,11 +61,11 @@ public class TesterGenerateIdentifierRanges {
 
 
 /*
- * Java Digit is all characters where Character.isJavaIdentifierPart(0 
returns true that aren't included in Java
+ * Java Digit is all characters where Character.isJavaIdentifierPart() 
returns true that aren't included in Java
  * Letter.
  */
 @Test
-public void testJavaDigitRanges() {
+public void testGenerateJavaDigitRanges() {
 int start = 0;
 int end = 0;
 boolean inRange = false;


-
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: Consistent method names and fix typo

2025-06-19 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 81b727b86a Consistent method names and fix typo
81b727b86a is described below

commit 81b727b86aee1bdd4085969ab9e14720912dc675
Author: Mark Thomas 
AuthorDate: Thu Jun 19 09:45:33 2025 +0100

Consistent method names and fix typo
---
 test/org/apache/el/parser/TesterGenerateIdentifierRanges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java 
b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
index 92c3c85472..e6db2270f5 100644
--- a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
+++ b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
@@ -59,11 +59,11 @@ public class TesterGenerateIdentifierRanges {
 
 
 /*
- * Java Digit is all characters where Character.isJavaIdentifierPart(0 
returns true that aren't included in Java
+ * Java Digit is all characters where Character.isJavaIdentifierPart() 
returns true that aren't included in Java
  * Letter.
  */
 @Test
-public void testJavaDigitRanges() {
+public void testGenerateJavaDigitRanges() {
 int start = 0;
 int end = 0;
 boolean inRange = false;


-
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: Consistent method names and fix typo

2025-06-19 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 a4da189aed Consistent method names and fix typo
a4da189aed is described below

commit a4da189aede74e0d58c905355d1d9fcbaeb5e32c
Author: Mark Thomas 
AuthorDate: Thu Jun 19 09:45:33 2025 +0100

Consistent method names and fix typo
---
 test/org/apache/el/parser/TesterGenerateIdentifierRanges.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java 
b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
index 2171f78bc2..993b602a80 100644
--- a/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
+++ b/test/org/apache/el/parser/TesterGenerateIdentifierRanges.java
@@ -59,11 +59,11 @@ public class TesterGenerateIdentifierRanges {
 
 
 /*
- * Java Digit is all characters where Character.isJavaIdentifierPart(0 
returns true that aren't included in Java
+ * Java Digit is all characters where Character.isJavaIdentifierPart() 
returns true that aren't included in Java
  * Letter.
  */
 @Test
-public void testJavaDigitRanges() {
+public void testGenerateJavaDigitRanges() {
 int start = 0;
 int end = 0;
 boolean inRange = false;


-
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: Drop IMPL_OBJ_START from parser

2025-06-19 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 ef5182f779 Drop IMPL_OBJ_START from parser
ef5182f779 is described below

commit ef5182f779e5cceab0b96efd18c9505201612f3b
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:20:48 2025 +0100

Drop IMPL_OBJ_START from parser
---
 java/org/apache/el/parser/ELParser.java|  4 ++--
 java/org/apache/el/parser/ELParser.jjt |  3 +--
 java/org/apache/el/parser/ELParserConstants.java   | 10 --
 .../org/apache/el/parser/ELParserTokenManager.java | 22 +++---
 webapps/docs/changelog.xml |  8 
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 58987c0862..e9e66409bc 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -4189,7 +4189,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[62];
+boolean[] la1tokens = new boolean[61];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4206,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 62; i++) {
+for (int i = 0; i < 61; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index af5bcfab19..0d9a79fbe6 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -547,9 +547,8 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< CONCAT : "+=" >
 |< ASSIGN : "=" >
 |< ARROW : "->" >
-|< IDENTIFIER : (|) 
(|)* >
+|< IDENTIFIER :  (|)* >
 |< FUNCTIONSUFFIX : () >
-|< #IMPL_OBJ_START: "#" >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index abec2c050a..82d6364fab 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -116,13 +116,11 @@ public interface ELParserConstants {
 /** RegularExpression Id. */
 int FUNCTIONSUFFIX = 57;
 /** RegularExpression Id. */
-int IMPL_OBJ_START = 58;
+int JAVALETTER = 58;
 /** RegularExpression Id. */
-int JAVALETTER = 59;
+int JAVADIGIT = 59;
 /** RegularExpression Id. */
-int JAVADIGIT = 60;
-/** RegularExpression Id. */
-int ILLEGAL_CHARACTER = 61;
+int ILLEGAL_CHARACTER = 60;
 
 /** Lexical state. */
 int DEFAULT = 0;
@@ -138,7 +136,7 @@ public interface ELParserConstants {
 "\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"", 
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
 "\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"", 
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
 "\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", 
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
-"\"+=\"", "\"=\"", "\"->\"", "", "", 
"\"#\"", "", "",
+"\"+=\"", "\"=\"", "\"->\"", "", "", 
"", "",
 "", };
 
 }
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java 
b/java/org/apache/el/parser/ELParserTokenManager.java
index afcf2ba0f4..47b36d5b37 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -896,7 +896,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18L & l) != 0L) {
+} else if (curChar == 36) {
 if (kind > 56) {
 kind = 56;
 }
@@ -1075,7 +1075,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 }
 break;
 case 27:
-if ((0x18L & l) == 0L) {
+if (curChar != 36) {
 break;
 }
 if (kind > 56) {
@@ -1781,7 +1781,7 @@ public class ELParserTokenManager implements 
ELParserConstants {

(tomcat) branch 9.0.x updated: Code clean-up - formatting. No functional change.

2025-06-19 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 f0d05e227e Code clean-up - formatting. No functional change.
f0d05e227e is described below

commit f0d05e227e259fa367696031262ebb44d9c243e6
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:25:07 2025 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 57 ++
 .../org/apache/el/parser/ELParserTokenManager.java |  3 +-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index bbbdb713f3..aaa0598f5f 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -264,8 +264,8 @@ public final class AstValue extends SimpleNode {
 
 int paramCount = types.length;
 
-if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) || !m.isVarArgs() &&
-(src == null || src.length != paramCount)) {
+if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) ||
+!m.isVarArgs() && (src == null || src.length != paramCount)) {
 String srcCount = null;
 if (src != null) {
 srcCount = Integer.toString(src.length);
diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 5ac6ce3b8e..35eef0941c 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -26,7 +26,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc000 = true;
 jjtree.openNodeScope(jjtn000);
 try {
-label_1: while (true) {
+label_1:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LITERAL_EXPRESSION:
 case START_DYNAMIC_EXPRESSION:
@@ -219,7 +220,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Semicolon() throws ParseException {
 Assignment();
-label_2: while (true) {
+label_2:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case SEMICOLON: {
 ;
@@ -292,7 +294,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 case MINUS:
 case IDENTIFIER: {
 Choice();
-label_3: while (true) {
+label_3:
+while (true) {
 if (jj_2_1(2)) {
 ;
 } else {
@@ -434,7 +437,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case IDENTIFIER: {
 Identifier();
-label_4: while (true) {
+label_4:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case COMMA: {
 ;
@@ -534,7 +538,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 jj_consume_token(RPAREN);
-label_5: while (true) {
+label_5:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LPAREN: {
 ;
@@ -584,7 +589,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Choice() throws ParseException {
 Or();
-label_6: while (true) {
+label_6:
+while (true) {
 if (jj_2_5(3)) {
 ;
 } else {
@@ -644,7 +650,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(jjtn001);
 try {
-label_7: while (true) {
+label_7:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case OR0: {
 jj_consume_token(OR0);
@@ -722,7 +729,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(jj

(tomcat) branch main updated (5116bb4d9d -> 5568f35ee9)

2025-06-19 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 5116bb4d9d Consistent method names and fix typo
 new cefdcf1520 Code clean-up - formatting. No functional change.
 new 5568f35ee9 Drop IMPL_OBJ_START from parser

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/el/parser/AstIdentifier.java   |  4 +-
 java/org/apache/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 61 ++
 java/org/apache/el/parser/ELParser.jjt |  3 +-
 java/org/apache/el/parser/ELParserConstants.java   | 10 ++--
 .../org/apache/el/parser/ELParserTokenManager.java | 25 -
 6 files changed, 62 insertions(+), 45 deletions(-)


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

(tomcat) 01/02: Code clean-up - formatting. No functional change.

2025-06-19 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 cefdcf1520cf46973f6a1ff0c6af1ab238aa91b3
Author: Mark Thomas 
AuthorDate: Thu Jun 19 09:56:12 2025 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/el/parser/AstIdentifier.java   |  4 +-
 java/org/apache/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 57 ++
 .../org/apache/el/parser/ELParserTokenManager.java |  3 +-
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/el/parser/AstIdentifier.java 
b/java/org/apache/el/parser/AstIdentifier.java
index 63b6e89e7a..835f32bd86 100644
--- a/java/org/apache/el/parser/AstIdentifier.java
+++ b/java/org/apache/el/parser/AstIdentifier.java
@@ -79,8 +79,8 @@ public final class AstIdentifier extends SimpleNode {
 ctx.setPropertyResolved(false);
 Object result;
 /*
- * Putting the Boolean into the ELContext is part of a performance 
optimisation for ImportELResolver.
- * When looking up "foo", the resolver can't differentiate between ${ 
foo } and ${ foo.bar }. This is important
+ * Putting the Boolean into the ELContext is part of a performance 
optimisation for ImportELResolver. When
+ * looking up "foo", the resolver can't differentiate between ${ foo } 
and ${ foo.bar }. This is important
  * because the expensive class lookup only needs to be performed in 
the later case. This flag tells the resolver
  * if the lookup can be skipped.
  */
diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 936245a0ae..60f52df1e7 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -269,8 +269,8 @@ public final class AstValue extends SimpleNode {
 
 int paramCount = types.length;
 
-if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) || !m.isVarArgs() &&
-(src == null || src.length != paramCount)) {
+if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) ||
+!m.isVarArgs() && (src == null || src.length != paramCount)) {
 String srcCount = null;
 if (src != null) {
 srcCount = Integer.toString(src.length);
diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 60e2729a36..97a4919ea9 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -26,7 +26,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc000 = true;
 jjtree.openNodeScope(jjtn000);
 try {
-label_1: while (true) {
+label_1:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LITERAL_EXPRESSION:
 case START_DYNAMIC_EXPRESSION:
@@ -219,7 +220,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Semicolon() throws ParseException {
 Assignment();
-label_2: while (true) {
+label_2:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case SEMICOLON: {
 ;
@@ -292,7 +294,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 case MINUS:
 case IDENTIFIER: {
 Ternary();
-label_3: while (true) {
+label_3:
+while (true) {
 if (jj_2_1(2)) {
 ;
 } else {
@@ -434,7 +437,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case IDENTIFIER: {
 Identifier();
-label_4: while (true) {
+label_4:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case COMMA: {
 ;
@@ -534,7 +538,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 jj_consume_token(RPAREN);
-label_5: while (true) {
+label_5:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LPAREN: {
 ;
@@ -584,7 +589,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELPar

(tomcat) 02/02: Drop IMPL_OBJ_START from parser

2025-06-19 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 5568f35ee906742b3fa55acc15b81930c3e5cb88
Author: Mark Thomas 
AuthorDate: Thu Jun 19 10:02:30 2025 +0100

Drop IMPL_OBJ_START from parser
---
 java/org/apache/el/parser/ELParser.java|  4 ++--
 java/org/apache/el/parser/ELParser.jjt |  3 +--
 java/org/apache/el/parser/ELParserConstants.java   | 10 --
 .../org/apache/el/parser/ELParserTokenManager.java | 22 +++---
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 97a4919ea9..c3dcdfb143 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -4335,7 +4335,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[62];
+boolean[] la1tokens = new boolean[61];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4352,7 +4352,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 62; i++) {
+for (int i = 0; i < 61; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index 222624e1fb..e8610ad129 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -554,9 +554,8 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< CONCAT : "+=" >
 |< ASSIGN : "=" >
 |< ARROW : "->" >
-|< IDENTIFIER : (|) 
(|)* >
+|< IDENTIFIER :  (|)* >
 |< FUNCTIONSUFFIX : () >
-|< #IMPL_OBJ_START: "#" >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index abec2c050a..82d6364fab 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -116,13 +116,11 @@ public interface ELParserConstants {
 /** RegularExpression Id. */
 int FUNCTIONSUFFIX = 57;
 /** RegularExpression Id. */
-int IMPL_OBJ_START = 58;
+int JAVALETTER = 58;
 /** RegularExpression Id. */
-int JAVALETTER = 59;
+int JAVADIGIT = 59;
 /** RegularExpression Id. */
-int JAVADIGIT = 60;
-/** RegularExpression Id. */
-int ILLEGAL_CHARACTER = 61;
+int ILLEGAL_CHARACTER = 60;
 
 /** Lexical state. */
 int DEFAULT = 0;
@@ -138,7 +136,7 @@ public interface ELParserConstants {
 "\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"", 
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
 "\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"", 
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
 "\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", 
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
-"\"+=\"", "\"=\"", "\"->\"", "", "", 
"\"#\"", "", "",
+"\"+=\"", "\"=\"", "\"->\"", "", "", 
"", "",
 "", };
 
 }
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java 
b/java/org/apache/el/parser/ELParserTokenManager.java
index 5d8aa28395..d75e8fcdf7 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -899,7 +899,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18L & l) != 0L) {
+} else if (curChar == 36) {
 if (kind > 56) {
 kind = 56;
 }
@@ -1078,7 +1078,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 }
 break;
 case 27:
-if ((0x18L & l) == 0L) {
+if (curChar != 36) {
 break;
 }
 if (kind > 56) {
@@ -1784,7 +1784,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18L & l) != 0L) {
+} else if (curC

(tomcat) branch main updated: Add change log entry

2025-06-19 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 950b4589cf Add change log entry
950b4589cf is described below

commit 950b4589cf0fa0903e76313bd9b34d244b0a5c46
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:08:22 2025 +0100

Add change log entry
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cadf1f7adb..a9f2a1dd82 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -227,6 +227,10 @@
 jakarta.el.ELResolver.StandaloneIdentifierMarker. (markt)
   
   
+  
+Remove IMPL_OBJ_START from EL grammar for
+IDENTIFIER. (markt)
+  
 
   
   


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

(tomcat) 01/02: Code clean-up - formatting. No functional change.

2025-06-19 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 06a1219a5386a5b0a9cbfc95a95a672e1f800bbd
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:09:09 2025 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 57 ++
 .../org/apache/el/parser/ELParserTokenManager.java |  3 +-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 936245a0ae..60f52df1e7 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -269,8 +269,8 @@ public final class AstValue extends SimpleNode {
 
 int paramCount = types.length;
 
-if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) || !m.isVarArgs() &&
-(src == null || src.length != paramCount)) {
+if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) ||
+!m.isVarArgs() && (src == null || src.length != paramCount)) {
 String srcCount = null;
 if (src != null) {
 srcCount = Integer.toString(src.length);
diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index e18120242c..58987c0862 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -26,7 +26,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc000 = true;
 jjtree.openNodeScope(jjtn000);
 try {
-label_1: while (true) {
+label_1:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LITERAL_EXPRESSION:
 case START_DYNAMIC_EXPRESSION:
@@ -219,7 +220,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Semicolon() throws ParseException {
 Assignment();
-label_2: while (true) {
+label_2:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case SEMICOLON: {
 ;
@@ -292,7 +294,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 case MINUS:
 case IDENTIFIER: {
 Choice();
-label_3: while (true) {
+label_3:
+while (true) {
 if (jj_2_1(2)) {
 ;
 } else {
@@ -434,7 +437,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case IDENTIFIER: {
 Identifier();
-label_4: while (true) {
+label_4:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case COMMA: {
 ;
@@ -534,7 +538,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 jj_consume_token(RPAREN);
-label_5: while (true) {
+label_5:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LPAREN: {
 ;
@@ -584,7 +589,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Choice() throws ParseException {
 Or();
-label_6: while (true) {
+label_6:
+while (true) {
 if (jj_2_5(3)) {
 ;
 } else {
@@ -644,7 +650,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(jjtn001);
 try {
-label_7: while (true) {
+label_7:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case OR0: {
 jj_consume_token(OR0);
@@ -722,7 +729,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(jjtn001);
 try {
-label_8: while (true) {
+label_8:
+while (true) {
 swi

(tomcat) 02/02: Drop IMPL_OBJ_START from parser

2025-06-19 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 f0006d7be55bc109ccd4289131e0671e58198a00
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:08:22 2025 +0100

Drop IMPL_OBJ_START from parser
---
 java/org/apache/el/parser/ELParser.java|  4 ++--
 java/org/apache/el/parser/ELParser.jjt |  3 +--
 java/org/apache/el/parser/ELParserConstants.java   | 10 --
 .../org/apache/el/parser/ELParserTokenManager.java | 22 +++---
 webapps/docs/changelog.xml |  8 
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 58987c0862..e9e66409bc 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -4189,7 +4189,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[62];
+boolean[] la1tokens = new boolean[61];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4206,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 62; i++) {
+for (int i = 0; i < 61; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index fb6260d5ab..10e7b94561 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -547,9 +547,8 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< CONCAT : "+=" >
 |< ASSIGN : "=" >
 |< ARROW : "->" >
-|< IDENTIFIER : (|) 
(|)* >
+|< IDENTIFIER :  (|)* >
 |< FUNCTIONSUFFIX : () >
-|< #IMPL_OBJ_START: "#" >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index abec2c050a..82d6364fab 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -116,13 +116,11 @@ public interface ELParserConstants {
 /** RegularExpression Id. */
 int FUNCTIONSUFFIX = 57;
 /** RegularExpression Id. */
-int IMPL_OBJ_START = 58;
+int JAVALETTER = 58;
 /** RegularExpression Id. */
-int JAVALETTER = 59;
+int JAVADIGIT = 59;
 /** RegularExpression Id. */
-int JAVADIGIT = 60;
-/** RegularExpression Id. */
-int ILLEGAL_CHARACTER = 61;
+int ILLEGAL_CHARACTER = 60;
 
 /** Lexical state. */
 int DEFAULT = 0;
@@ -138,7 +136,7 @@ public interface ELParserConstants {
 "\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"", 
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
 "\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"", 
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
 "\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", 
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
-"\"+=\"", "\"=\"", "\"->\"", "", "", 
"\"#\"", "", "",
+"\"+=\"", "\"=\"", "\"->\"", "", "", 
"", "",
 "", };
 
 }
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java 
b/java/org/apache/el/parser/ELParserTokenManager.java
index c1bdc928e3..c9bfe9c140 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -901,7 +901,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18L & l) != 0L) {
+} else if (curChar == 36) {
 if (kind > 56) {
 kind = 56;
 }
@@ -1080,7 +1080,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 }
 break;
 case 27:
-if ((0x18L & l) == 0L) {
+if (curChar != 36) {
 break;
 }
 if (kind > 56) {
@@ -1786,7 +1786,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18

(tomcat) branch 11.0.x updated (a4d1cb4fe6 -> f0006d7be5)

2025-06-19 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 a4d1cb4fe6 Consistent method names and fix typo
 new 06a1219a53 Code clean-up - formatting. No functional change.
 new f0006d7be5 Drop IMPL_OBJ_START from parser

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/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 61 ++
 java/org/apache/el/parser/ELParser.jjt |  3 +-
 java/org/apache/el/parser/ELParserConstants.java   | 10 ++--
 .../org/apache/el/parser/ELParserTokenManager.java | 25 -
 webapps/docs/changelog.xml |  8 +++
 6 files changed, 68 insertions(+), 43 deletions(-)


-
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: Code clean-up - formatting. No functional change.

2025-06-19 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 eb08a93cf8 Code clean-up - formatting. No functional change.
eb08a93cf8 is described below

commit eb08a93cf811fb16b5040f4765d7fbb08ec8f4fc
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:18:14 2025 +0100

Code clean-up - formatting. No functional change.
---
 java/org/apache/el/parser/AstValue.java|  4 +-
 java/org/apache/el/parser/ELParser.java| 57 ++
 .../org/apache/el/parser/ELParserTokenManager.java |  3 +-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 7e32a5cfb6..abb2336c62 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -284,8 +284,8 @@ public final class AstValue extends SimpleNode {
 
 int paramCount = types.length;
 
-if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) || !m.isVarArgs() &&
-(src == null || src.length != paramCount)) {
+if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount > 
src.length) ||
+!m.isVarArgs() && (src == null || src.length != paramCount)) {
 String srcCount = null;
 if (src != null) {
 srcCount = Integer.toString(src.length);
diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index e18120242c..58987c0862 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -26,7 +26,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc000 = true;
 jjtree.openNodeScope(jjtn000);
 try {
-label_1: while (true) {
+label_1:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LITERAL_EXPRESSION:
 case START_DYNAMIC_EXPRESSION:
@@ -219,7 +220,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Semicolon() throws ParseException {
 Assignment();
-label_2: while (true) {
+label_2:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case SEMICOLON: {
 ;
@@ -292,7 +294,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 case MINUS:
 case IDENTIFIER: {
 Choice();
-label_3: while (true) {
+label_3:
+while (true) {
 if (jj_2_1(2)) {
 ;
 } else {
@@ -434,7 +437,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case IDENTIFIER: {
 Identifier();
-label_4: while (true) {
+label_4:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case COMMA: {
 ;
@@ -534,7 +538,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 jj_consume_token(RPAREN);
-label_5: while (true) {
+label_5:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case LPAREN: {
 ;
@@ -584,7 +589,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
  */
 final public void Choice() throws ParseException {
 Or();
-label_6: while (true) {
+label_6:
+while (true) {
 if (jj_2_5(3)) {
 ;
 } else {
@@ -644,7 +650,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(jjtn001);
 try {
-label_7: while (true) {
+label_7:
+while (true) {
 switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
 case OR0: {
 jj_consume_token(OR0);
@@ -722,7 +729,8 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 boolean jjtc001 = true;
 jjtree.openNodeScope(

(tomcat) branch 9.0.x updated: Drop IMPL_OBJ_START from parser

2025-06-19 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 eea7dea0c6 Drop IMPL_OBJ_START from parser
eea7dea0c6 is described below

commit eea7dea0c6bd0ff57ea0c4e99e7dfbd627f70596
Author: Mark Thomas 
AuthorDate: Thu Jun 19 11:28:47 2025 +0100

Drop IMPL_OBJ_START from parser
---
 java/org/apache/el/parser/ELParser.java|  4 ++--
 java/org/apache/el/parser/ELParser.jjt |  3 +--
 java/org/apache/el/parser/ELParserConstants.java   | 10 --
 .../org/apache/el/parser/ELParserTokenManager.java | 22 +++---
 webapps/docs/changelog.xml |  8 
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java 
b/java/org/apache/el/parser/ELParser.java
index 35eef0941c..3d2bbcb4cd 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -4189,7 +4189,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 /** Generate ParseException. */
 public ParseException generateParseException() {
 jj_expentries.clear();
-boolean[] la1tokens = new boolean[62];
+boolean[] la1tokens = new boolean[61];
 if (jj_kind >= 0) {
 la1tokens[jj_kind] = true;
 jj_kind = -1;
@@ -4206,7 +4206,7 @@ public class ELParser/* @bgen(jjtree) */ implements 
ELParserTreeConstants, ELPar
 }
 }
 }
-for (int i = 0; i < 62; i++) {
+for (int i = 0; i < 61; i++) {
 if (la1tokens[i]) {
 jj_expentry = new int[1];
 jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt 
b/java/org/apache/el/parser/ELParser.jjt
index 8ebaab1bc3..fca64c0408 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -547,9 +547,8 @@ java.util.Deque deque = new 
java.util.ArrayDeque();
 |< CONCAT : "+=" >
 |< ASSIGN : "=" >
 |< ARROW : "->" >
-|< IDENTIFIER : (|) 
(|)* >
+|< IDENTIFIER :  (|)* >
 |< FUNCTIONSUFFIX : () >
-|< #IMPL_OBJ_START: "#" >
 |< #JAVALETTER:
 [
 "\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java 
b/java/org/apache/el/parser/ELParserConstants.java
index abec2c050a..82d6364fab 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -116,13 +116,11 @@ public interface ELParserConstants {
 /** RegularExpression Id. */
 int FUNCTIONSUFFIX = 57;
 /** RegularExpression Id. */
-int IMPL_OBJ_START = 58;
+int JAVALETTER = 58;
 /** RegularExpression Id. */
-int JAVALETTER = 59;
+int JAVADIGIT = 59;
 /** RegularExpression Id. */
-int JAVADIGIT = 60;
-/** RegularExpression Id. */
-int ILLEGAL_CHARACTER = 61;
+int ILLEGAL_CHARACTER = 60;
 
 /** Lexical state. */
 int DEFAULT = 0;
@@ -138,7 +136,7 @@ public interface ELParserConstants {
 "\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"", 
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
 "\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"", 
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
 "\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", 
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
-"\"+=\"", "\"=\"", "\"->\"", "", "", 
"\"#\"", "", "",
+"\"+=\"", "\"=\"", "\"->\"", "", "", 
"", "",
 "", };
 
 }
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java 
b/java/org/apache/el/parser/ELParserTokenManager.java
index 17e0f7b0bb..e28776591c 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -890,7 +890,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 {
 jjCheckNAddStates(18, 22);
 }
-} else if ((0x18L & l) != 0L) {
+} else if (curChar == 36) {
 if (kind > 56) {
 kind = 56;
 }
@@ -1069,7 +1069,7 @@ public class ELParserTokenManager implements 
ELParserConstants {
 }
 break;
 case 27:
-if ((0x18L & l) == 0L) {
+if (curChar != 36) {
 break;
 }
 if (kind > 56) {
@@ -1775,7 +1775,7 @@ public class ELParserTokenManager implements 
ELParserConstants {

(tomcat) branch main updated: Fix JMX value for keepAliveCount

2025-06-19 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 ee56e34a3f Fix JMX value for keepAliveCount
ee56e34a3f is described below

commit ee56e34a3fb62cf42223222f21786dc1f55bee85
Author: remm 
AuthorDate: Thu Jun 19 12:32:39 2025 +0200

Fix JMX value for keepAliveCount

keepAliveCount should mostly reflect the amount of keys in the selector,
rather than something more complicated.
Add useVirtualThreads flag value to JMX.
---
 java/org/apache/tomcat/util/net/NioEndpoint.java   | 2 +-
 java/org/apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java 
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index f6ef6a5b30..62bcae1a30 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -634,7 +634,7 @@ public class NioEndpoint extends 
AbstractNetworkChannelEndpoint
 
+
+
 
   868 by
 qingdaoheze. (markt)
   
+  
+Fix JMX value for keepAliveCount on the endpoint. Also add
+the value of useVirtualThreads in JMX. (remm)
+  
 
   
   


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

37 matches

Mail list logo