[GitHub] [tomcat] dsoumis opened a new pull request, #578: Remove redundant modifiers for interface members

2023-02-01 Thread via GitHub 


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

   I have parsed the whole project and removed redundant modifiers for 
interface members resulting in vanishing of ~2000 warnings.
   
   Although it's a big commit, I strongly believe that it should be reviewed 
and if ok, merged, as it provides an overall more consistent project.


-- 
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: February release round

2023-02-01 Thread Konstantin Kolinko 
вт, 31 янв. 2023 г. в 20:52, Mark Thomas :
>
> Hi all,
>
> As I started to think about preparing for the February release round, I
> received the notification from the OpenSSL project that they have a
> security release planned for a week today. That security release may (or
> may not) trigger a Tomcat Native release.

1. A mail on OpenSSL announcements mail list says:
"on Tuesday 7th February 2023  between 1300-1700 UTC."
https://mta.openssl.org/pipermail/openssl-announce/2023-January/000248.html

2. There were releases of APR 1.7.1, and of APR Utils a day ago.

CVE-2022-28331 fixed in APR 1.7.1 mentions "apr_socket_sendv()",
and that function is used in Tomcat Native 1.2.x
(and not used in Tomcat Native 2.0.x).

Current Tomcat Native binaries are built with APR 1.7.0.

Thus I think releases of both 1.2.x and 2.0.x branches will be needed.

> I was wondering whether to delay the February release round in case we
> need to pick up an new Tomcat Native release. It really only affects
> Windows users since everyone else builds their own Tomcat Native
> library. In the Windows case it is trivial to update the library if
> required so I'm not sure if it merits delaying the releases...
>
> Thoughts?

I am available to test and vote for Tomcat 8.5 and 9.0.
I have no plans for Tomcat 10.1 and 11 now.

Best regards,
Konstantin Kolinko

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

[Bug 66441] Static field import failed on Expression Language lookup

2023-02-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66441

Mark Thomas  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |---

--- Comment #3 from Mark Thomas  ---
Re-opening this as while Tomcat's pages API may handle this correctly, Jasper
(Tomcat's pages implementation) does not.

-- 
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 BZ 66441 - Make imports of static fields in JSPs visible to EL

2023-02-01 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 44dc1c19a6 Fix BZ 66441 - Make imports of static fields in JSPs 
visible to EL
44dc1c19a6 is described below

commit 44dc1c19a601c0ddf902d7ab0951024ee094381e
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:49:27 2023 +

Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
---
 .../org/apache/jasper/runtime/PageContextImpl.java |  7 +++-
 .../servlet/jsp/el/TestImportELResolver.java   | 39 ++
 test/webapp/bug6/bug66441.jsp  | 23 +
 webapps/docs/changelog.xml |  4 +++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java 
b/java/org/apache/jasper/runtime/PageContextImpl.java
index e3388f0aa7..26d313de08 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -696,7 +696,12 @@ public class PageContextImpl extends PageContext {
 Set classImports = ((JspSourceImports) 
servlet).getClassImports();
 if (classImports != null) {
 for (String classImport : classImports) {
-ih.importClass(classImport);
+if (classImport.startsWith("static ")) {
+classImport = classImport.substring(7);
+ih.importStatic(classImport);
+} else {
+ih.importClass(classImport);
+}
 }
 }
 }
diff --git a/test/jakarta/servlet/jsp/el/TestImportELResolver.java 
b/test/jakarta/servlet/jsp/el/TestImportELResolver.java
new file mode 100644
index 00..b68529d821
--- /dev/null
+++ b/test/jakarta/servlet/jsp/el/TestImportELResolver.java
@@ -0,0 +1,39 @@
+/*
+ * 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 jakarta.servlet.jsp.el;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestImportELResolver extends TomcatBaseTest {
+
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
+@Test
+public void testImportStaticFields() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + 
"/test/bug6/bug66441.jsp");
+
+String result = res.toString();
+
+Assert.assertTrue(result.contains("EL  - Long min value is 
-9223372036854775808"));
+Assert.assertTrue(result.contains("JSP - Long min value is 
-9223372036854775808"));
+}
+}
diff --git a/test/webapp/bug6/bug66441.jsp 
b/test/webapp/bug6/bug66441.jsp
new file mode 100644
index 00..ecc45c71bc
--- /dev/null
+++ b/test/webapp/bug6/bug66441.jsp
@@ -0,0 +1,23 @@
+<%--
+ 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.
+--%>
+<%@ page import="static java.lang.Long.MIN_VALUE"%>
+
+  
+EL  - Long min value is ${MIN_VALUE}
+JSP - Long min value is <%= MIN_VALUE  %>
+  
+
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/

[tomcat] branch 10.1.x updated: Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

2023-02-01 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 01f9a9dd8d Fix BZ 66441 - Make imports of static fields in JSPs 
visible to EL
01f9a9dd8d is described below

commit 01f9a9dd8d6a2677c81a016dbf6e2db92bd66c71
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:49:27 2023 +

Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
---
 .../org/apache/jasper/runtime/PageContextImpl.java |  7 +++-
 .../servlet/jsp/el/TestImportELResolver.java   | 39 ++
 test/webapp/bug6/bug66441.jsp  | 23 +
 webapps/docs/changelog.xml |  4 +++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java 
b/java/org/apache/jasper/runtime/PageContextImpl.java
index 5d2ecbd4e5..fe88e12fa0 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -716,7 +716,12 @@ public class PageContextImpl extends PageContext {
 Set classImports = ((JspSourceImports) 
servlet).getClassImports();
 if (classImports != null) {
 for (String classImport : classImports) {
-ih.importClass(classImport);
+if (classImport.startsWith("static ")) {
+classImport = classImport.substring(7);
+ih.importStatic(classImport);
+} else {
+ih.importClass(classImport);
+}
 }
 }
 }
diff --git a/test/jakarta/servlet/jsp/el/TestImportELResolver.java 
b/test/jakarta/servlet/jsp/el/TestImportELResolver.java
new file mode 100644
index 00..b68529d821
--- /dev/null
+++ b/test/jakarta/servlet/jsp/el/TestImportELResolver.java
@@ -0,0 +1,39 @@
+/*
+ * 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 jakarta.servlet.jsp.el;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestImportELResolver extends TomcatBaseTest {
+
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
+@Test
+public void testImportStaticFields() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + 
"/test/bug6/bug66441.jsp");
+
+String result = res.toString();
+
+Assert.assertTrue(result.contains("EL  - Long min value is 
-9223372036854775808"));
+Assert.assertTrue(result.contains("JSP - Long min value is 
-9223372036854775808"));
+}
+}
diff --git a/test/webapp/bug6/bug66441.jsp 
b/test/webapp/bug6/bug66441.jsp
new file mode 100644
index 00..ecc45c71bc
--- /dev/null
+++ b/test/webapp/bug6/bug66441.jsp
@@ -0,0 +1,23 @@
+<%--
+ 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.
+--%>
+<%@ page import="static java.lang.Long.MIN_VALUE"%>
+
+  
+EL  - Long min value is ${MIN_VALUE}
+JSP - Long min value is <%= MIN_VALUE  %>
+  
+
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/d

[tomcat] branch 9.0.x updated: Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

2023-02-01 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 b17ef1cdae Fix BZ 66441 - Make imports of static fields in JSPs 
visible to EL
b17ef1cdae is described below

commit b17ef1cdaeb81603a210b55eabf98bc0c88a4f03
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:49:27 2023 +

Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
---
 .../org/apache/jasper/runtime/PageContextImpl.java |  7 +++-
 .../javax/servlet/jsp/el/TestImportELResolver.java | 39 ++
 test/webapp/bug6/bug66441.jsp  | 23 +
 webapps/docs/changelog.xml |  4 +++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java 
b/java/org/apache/jasper/runtime/PageContextImpl.java
index f66e6e55de..363bc22ef4 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -705,7 +705,12 @@ public class PageContextImpl extends PageContext {
 Set classImports = ((JspSourceImports) 
servlet).getClassImports();
 if (classImports != null) {
 for (String classImport : classImports) {
-ih.importClass(classImport);
+if (classImport.startsWith("static ")) {
+classImport = classImport.substring(7);
+ih.importStatic(classImport);
+} else {
+ih.importClass(classImport);
+}
 }
 }
 }
diff --git a/test/javax/servlet/jsp/el/TestImportELResolver.java 
b/test/javax/servlet/jsp/el/TestImportELResolver.java
new file mode 100644
index 00..f065822ec6
--- /dev/null
+++ b/test/javax/servlet/jsp/el/TestImportELResolver.java
@@ -0,0 +1,39 @@
+/*
+ * 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 javax.servlet.jsp.el;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestImportELResolver extends TomcatBaseTest {
+
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
+@Test
+public void testImportStaticFields() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + 
"/test/bug6/bug66441.jsp");
+
+String result = res.toString();
+
+Assert.assertTrue(result.contains("EL  - Long min value is 
-9223372036854775808"));
+Assert.assertTrue(result.contains("JSP - Long min value is 
-9223372036854775808"));
+}
+}
diff --git a/test/webapp/bug6/bug66441.jsp 
b/test/webapp/bug6/bug66441.jsp
new file mode 100644
index 00..ecc45c71bc
--- /dev/null
+++ b/test/webapp/bug6/bug66441.jsp
@@ -0,0 +1,23 @@
+<%--
+ 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.
+--%>
+<%@ page import="static java.lang.Long.MIN_VALUE"%>
+
+  
+EL  - Long min value is ${MIN_VALUE}
+JSP - Long min value is <%= MIN_VALUE  %>
+  
+
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/change

[tomcat] branch main updated: MOve to correct section

2023-02-01 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 0ab2fc6bd5 MOve to correct section
0ab2fc6bd5 is described below

commit 0ab2fc6bd50496454ee02360f34b2cdd633ce14c
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:56:05 2023 +

MOve to correct section
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 156b1a5c6d..ed849ea3e8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,10 +156,6 @@
 Log basic information for each configured TLS certificate when Tomcat
 starts. (markt)
   
-  
-66441: Make imports of static fields in JSPs visible to any
-EL expressions used on the page. (markt)
-  
   
 66442: When an HTTP/2 response must not include a body,
 ensure that the end of stream flag is set on the headers frame and that
@@ -173,6 +169,10 @@
 66419: Fix calls from expression language to a method that
 accepts varargs when only one argument was passed. (markt)
   
+  
+66441: Make imports of static fields in JSPs visible to any
+EL expressions used on the page. (markt)
+  
 
   
   


-
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: MOve to correct section

2023-02-01 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 156e7f661d MOve to correct section
156e7f661d is described below

commit 156e7f661da5e99e797a5bd61e6c86f51f88591f
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:56:05 2023 +

MOve to correct section
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5b2debd984..7e3c90d07c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,10 +127,6 @@
 Log basic information for each configured TLS certificate when Tomcat
 starts. (markt)
   
-  
-66441: Make imports of static fields in JSPs visible to any
-EL expressions used on the page. (markt)
-  
   
 66442: When an HTTP/2 response must not include a body,
 ensure that the end of stream flag is set on the headers frame and that
@@ -150,6 +146,10 @@
 66419: Fix calls from expression language to a method that
 accepts varargs when only one argument was passed. (markt)
   
+  
+66441: Make imports of static fields in JSPs visible to any
+EL expressions used on the page. (markt)
+  
 
   
   


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

[tomcat] branch 9.0.x updated: MOve to correct section

2023-02-01 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 0c07ea76c5 MOve to correct section
0c07ea76c5 is described below

commit 0c07ea76c51ac6ded30a1ed5bac1360a91b73a30
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:56:05 2023 +

MOve to correct section
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc91e5c02b..f125bf12e0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,10 +119,6 @@
 Log basic information for each configured TLS certificate when Tomcat
 starts. (markt)
   
-  
-66441: Make imports of static fields in JSPs visible to any
-EL expressions used on the page. (markt)
-  
   
 66442: When an HTTP/2 response must not include a body,
 ensure that the end of stream flag is set on the headers frame and that
@@ -142,6 +138,10 @@
 66419: Fix calls from expression language to a method that
 accepts varargs when only one argument was passed. (markt)
   
+  
+66441: Make imports of static fields in JSPs visible to any
+EL expressions used on the page. (markt)
+  
 
   
   


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

[tomcat] branch 8.5.x updated: Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

2023-02-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new c6bf5a415e Fix BZ 66441 - Make imports of static fields in JSPs 
visible to EL
c6bf5a415e is described below

commit c6bf5a415e83233e645d5e7dfb35ebe61cc811fe
Author: Mark Thomas 
AuthorDate: Wed Feb 1 14:49:27 2023 +

Fix BZ 66441 - Make imports of static fields in JSPs visible to EL

https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
---
 .../org/apache/jasper/runtime/PageContextImpl.java |  7 +++-
 .../javax/servlet/jsp/el/TestImportELResolver.java | 39 ++
 test/webapp/bug6/bug66441.jsp  | 23 +
 webapps/docs/changelog.xml |  4 +++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java 
b/java/org/apache/jasper/runtime/PageContextImpl.java
index d4bf054b29..3034ab2023 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -957,7 +957,12 @@ public class PageContextImpl extends PageContext {
 Set classImports = ((JspSourceImports) 
servlet).getClassImports();
 if (classImports != null) {
 for (String classImport : classImports) {
-ih.importClass(classImport);
+if (classImport.startsWith("static ")) {
+classImport = classImport.substring(7);
+ih.importStatic(classImport);
+} else {
+ih.importClass(classImport);
+}
 }
 }
 }
diff --git a/test/javax/servlet/jsp/el/TestImportELResolver.java 
b/test/javax/servlet/jsp/el/TestImportELResolver.java
new file mode 100644
index 00..f065822ec6
--- /dev/null
+++ b/test/javax/servlet/jsp/el/TestImportELResolver.java
@@ -0,0 +1,39 @@
+/*
+ * 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 javax.servlet.jsp.el;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestImportELResolver extends TomcatBaseTest {
+
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=66441
+@Test
+public void testImportStaticFields() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() + 
"/test/bug6/bug66441.jsp");
+
+String result = res.toString();
+
+Assert.assertTrue(result.contains("EL  - Long min value is 
-9223372036854775808"));
+Assert.assertTrue(result.contains("JSP - Long min value is 
-9223372036854775808"));
+}
+}
diff --git a/test/webapp/bug6/bug66441.jsp 
b/test/webapp/bug6/bug66441.jsp
new file mode 100644
index 00..ecc45c71bc
--- /dev/null
+++ b/test/webapp/bug6/bug66441.jsp
@@ -0,0 +1,23 @@
+<%--
+ 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.
+--%>
+<%@ page import="static java.lang.Long.MIN_VALUE"%>
+
+  
+EL  - Long min value is ${MIN_VALUE}
+JSP - Long min value is <%= MIN_VALUE  %>
+  
+
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/change

[tomcat] branch main updated: Improve grammar - reported via POEditor

2023-02-01 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 6447b4c20d Improve grammar - reported via POEditor
6447b4c20d is described below

commit 6447b4c20db94aa05a6176ec73330e8404e0cf84
Author: Mark Thomas 
AuthorDate: Wed Feb 1 15:08:46 2023 +

Improve grammar - reported via POEditor
---
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 2816301608..3cb738b131 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -31,8 +31,8 @@ mcastServiceImpl.invalid.stopLevel=Invalid stop level. Only 
acceptable levels ar
 mcastServiceImpl.memberDisappeared.failed=Unable to process member disappeared 
message.
 mcastServiceImpl.packet.tooLong=Multicast packet received was too long, 
dropping package:[{0}]
 mcastServiceImpl.receive.running=McastService.receive already running.
-mcastServiceImpl.recovery=Tribes membership, running recovery thread, 
multicasting is not functional.
-mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed, trying 
again in [{1}] seconds
+mcastServiceImpl.recovery=Tribes membership running recovery thread. 
Multicasting is not functional.
+mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed. Trying 
again in [{1}] seconds.
 mcastServiceImpl.recovery.startFailed=Recovery thread failed to start 
membership service.
 mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership 
service.
 mcastServiceImpl.recovery.successful=Membership recovery was successful.


-
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: Improve grammar - reported via POEditor

2023-02-01 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 e6567521d4 Improve grammar - reported via POEditor
e6567521d4 is described below

commit e6567521d466349b4bfda1a3e0c0816fcc04c52a
Author: Mark Thomas 
AuthorDate: Wed Feb 1 15:08:46 2023 +

Improve grammar - reported via POEditor
---
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 2816301608..3cb738b131 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -31,8 +31,8 @@ mcastServiceImpl.invalid.stopLevel=Invalid stop level. Only 
acceptable levels ar
 mcastServiceImpl.memberDisappeared.failed=Unable to process member disappeared 
message.
 mcastServiceImpl.packet.tooLong=Multicast packet received was too long, 
dropping package:[{0}]
 mcastServiceImpl.receive.running=McastService.receive already running.
-mcastServiceImpl.recovery=Tribes membership, running recovery thread, 
multicasting is not functional.
-mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed, trying 
again in [{1}] seconds
+mcastServiceImpl.recovery=Tribes membership running recovery thread. 
Multicasting is not functional.
+mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed. Trying 
again in [{1}] seconds.
 mcastServiceImpl.recovery.startFailed=Recovery thread failed to start 
membership service.
 mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership 
service.
 mcastServiceImpl.recovery.successful=Membership recovery was successful.


-
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: Improve grammar - reported via POEditor

2023-02-01 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 738f757f1a Improve grammar - reported via POEditor
738f757f1a is described below

commit 738f757f1ae51abab0d328508990f914cbc2b1b8
Author: Mark Thomas 
AuthorDate: Wed Feb 1 15:08:46 2023 +

Improve grammar - reported via POEditor
---
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index 62376409bc..1ec2c6f506 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -31,8 +31,8 @@ mcastServiceImpl.invalid.stopLevel=Invalid stop level. Only 
acceptable levels ar
 mcastServiceImpl.memberDisappeared.failed=Unable to process member disappeared 
message.
 mcastServiceImpl.packet.tooLong=Multicast packet received was too long, 
dropping package:[{0}]
 mcastServiceImpl.receive.running=McastService.receive already running.
-mcastServiceImpl.recovery=Tribes membership, running recovery thread, 
multicasting is not functional.
-mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed, trying 
again in [{1}] seconds
+mcastServiceImpl.recovery=Tribes membership running recovery thread. 
Multicasting is not functional.
+mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed. Trying 
again in [{1}] seconds.
 mcastServiceImpl.recovery.startFailed=Recovery thread failed to start 
membership service.
 mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership 
service.
 mcastServiceImpl.recovery.successful=Membership recovery was successful.


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

[tomcat] branch 8.5.x updated: Improve grammar - reported via POEditor

2023-02-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new c899f1c061 Improve grammar - reported via POEditor
c899f1c061 is described below

commit c899f1c061fcf80aaa1fc14c86e8acac2cd80594
Author: Mark Thomas 
AuthorDate: Wed Feb 1 15:08:46 2023 +

Improve grammar - reported via POEditor
---
 java/org/apache/catalina/tribes/membership/LocalStrings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/LocalStrings.properties 
b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
index a4bd33ae95..2142f878a1 100644
--- a/java/org/apache/catalina/tribes/membership/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/membership/LocalStrings.properties
@@ -31,8 +31,8 @@ mcastServiceImpl.invalid.stopLevel=Invalid stop level. Only 
acceptable levels ar
 mcastServiceImpl.memberDisappeared.failed=Unable to process member disappeared 
message.
 mcastServiceImpl.packet.tooLong=Multicast packet received was too long, 
dropping package:[{0}]
 mcastServiceImpl.receive.running=McastService.receive already running.
-mcastServiceImpl.recovery=Tribes membership, running recovery thread, 
multicasting is not functional.
-mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed, trying 
again in [{1}] seconds
+mcastServiceImpl.recovery=Tribes membership running recovery thread. 
Multicasting is not functional.
+mcastServiceImpl.recovery.failed=Recovery attempt number [{0}] failed. Trying 
again in [{1}] seconds.
 mcastServiceImpl.recovery.startFailed=Recovery thread failed to start 
membership service.
 mcastServiceImpl.recovery.stopFailed=Recovery thread failed to stop membership 
service.
 mcastServiceImpl.recovery.successful=Membership recovery was successful.


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

[Bug 66441] Static field import failed on Expression Language lookup

2023-02-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=66441

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #4 from Mark Thomas  ---
Fixed in:
- 11.0.x for 11.0.0-M3 onwards
- 10.1.x for 10.1.6 onwards
-  9.0.x for  9.0.72 onwards
-  8.5.x for  8.5.86 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: February release round

2023-02-01 Thread Rémy Maucherat 
On Tue, Jan 31, 2023 at 6:52 PM Mark Thomas  wrote:
>
> Hi all,
>
> As I started to think about preparing for the February release round, I
> received the notification from the OpenSSL project that they have a
> security release planned for a week today. That security release may (or
> may not) trigger a Tomcat Native release.
>
> I was wondering whether to delay the February release round in case we
> need to pick up an new Tomcat Native release. It really only affects
> Windows users since everyone else builds their own Tomcat Native
> library. In the Windows case it is trivial to update the library if
> required so I'm not sure if it merits delaying the releases...
>
> Thoughts?

It should be ok to wait for a few days IMO.

Rémy

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

Re: [tomcat] branch 9.0.x updated: Fix BZ 66455 - avoid ClassCastException when processing window update

2023-02-01 Thread Christopher Schultz 

Mark,

On 1/30/23 18:08, Mark Thomas wrote:

On 30/01/2023 21:03, Christopher Schultz wrote:



Is the default window size really 65535 bytes (64k - 1)? That would be 
very unusual (is this some kind of spec-mandated window size? still 
seems weird). It seems more likely that it is a full 64k bytes and 
that the max index into that array would be 64k - 1.


RFC 9113, section 6.5.2, SETTINGS_INITIAL_WINDOW_SIZE

"The initial value is (2^16)-1 (65,535) octets."


How does sending a window update of 1025 increase the connection 
window size to 57k? Why won't 1024 do it? Or 512? Or 1024 * 57? Or (64 
- 8) * 1024 - 1?


Initial size: 64k -1
Initial request (sent as part of http2Connect()) has an exactly 8k 
response body.

New size = 64k - 1 - 8k
  = 56k -1

Increase window size by 1k +1 gives:
56k - 1 + 1k + 1 = 57k

How does sending 7 updates with odd i values between 3 and 17 fill the 
first 56k of the connection window?


7 requests each with response bodies of 8k uses 7 * 8k = 56k of the 
connection window.


Why use 3 - 17 instead of 0 - 6? Or, if you need some single-digit i 
values and some double-digits, why not use more straightforward loop 
bounds. It just looks very strange with no explanation.


RFC 9113, section 5.1.1

"Streams initiated by a client MUST use odd-numbered stream identifiers; 
those initiated by the server MUST use even-numbered stream identifiers. 
A stream identifier of zero (0x00) is used for connection control 
messages; the stream identifier of zero cannot be used to establish a 
new stream.


The identifier of a newly established stream MUST be numerically greater 
than all streams that the initiating endpoint has opened or reserved."


The initial request was stream 1. Hence the next 7 requests are streams 
3, 5, 7, 9, 11, 13 and 15.


I hope these questions aren't just annoying. I'm sure you know what 
you are doing. But I know if I was looking at this code to figure out 
why the unit test was failing in the future, I would be at a serious 
loss to understand what it was even doing in the first place.


Yes, trying to do that without first understanding the HTTP/2 protocol 
would be tricky.


Thanks for taking the time to explain. :)

-chris

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

Re: February release round

2023-02-01 Thread Christopher Schultz 

Mark,

On 1/31/23 12:51, Mark Thomas wrote:

Hi all,

As I started to think about preparing for the February release round, I 
received the notification from the OpenSSL project that they have a 
security release planned for a week today. That security release may (or 
may not) trigger a Tomcat Native release.


I was wondering whether to delay the February release round in case we 
need to pick up an new Tomcat Native release. It really only affects 
Windows users since everyone else builds their own Tomcat Native 
library. In the Windows case it is trivial to update the library if 
required so I'm not sure if it merits delaying the releases...


Thoughts?


+1 to a new set of tcnative releases especially given Konstantin's 
additional info about the related APR releases.


I don't see anything urgent in the Tomcat releases that can't wait for a 
forthcoming tcnative to be available.


-chris

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

[Bug 57129] Regression. Load WEB-INF/lib jarfiles in alphabetical order

2023-02-01 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57129

--- Comment #52 from Christopher Schultz  ---
(In reply to Philippe Cloutier from comment #50)
> Typically, with Maven, if a project depends on 3 libraries and pom.xml lists
> B before A and finally C, the WAR file can contain b.jar before a.jar and
> finally c.jar. But it can also be alphabetical (a.jar, b.jar, c.jar).

You should have your project structured such that each dependency is isolated.
You should not, for example, have libfoo-with-dependencies.jar libbar.jar and
libbaz.jar if libfoo-with-dependencies.jar contains its own dependencies e.g.
classes from libbar.jar and libbaz.jar.

> I do not know how to avoid that besides
> ensuring that the WAR-s do not contain classes with identical fully
> qualified names.

They would have to be included in multiple JAR files.

this may be helpful for you:
https://github.com/ChristopherSchultz/duplicate-resource-finder

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

2023-02-01 Thread buildbot 
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/440
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 738f757f1ae51abab0d328508990f914cbc2b1b8


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

[tomcat-native] branch main updated: Update recommended APR version to 1.7.1

2023-02-01 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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new c207a5ec3 Update recommended APR version to 1.7.1
c207a5ec3 is described below

commit c207a5ec37b2996904d10a3d96ce5f550884fa9d
Author: Mark Thomas 
AuthorDate: Wed Feb 1 18:04:53 2023 +

Update recommended APR version to 1.7.1
---
 native/srclib/VERSIONS| 2 +-
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index 10c33778f..41323f745 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -4,7 +4,7 @@ The current minimum versions are:
 
 The following version of the libraries are recommended:
 
-- APR 1.7.0 or later, http://apr.apache.org
+- APR 1.7.1 or later, http://apr.apache.org
 - OpenSSL 3.0.7 or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 7fa4f2d6e..ebdb52be2 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,9 @@
   
 
 
+
+  Update the recommended minimum version of APR to 1.7.1. (markt)
+
 
 
   


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

[tomcat-native] branch 1.2.x updated: Update recommended APR version to 1.7.1

2023-02-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.2.x by this push:
 new 310c2b98e Update recommended APR version to 1.7.1
310c2b98e is described below

commit 310c2b98e88dfb654d77d4efc5d90b7ca7f034c7
Author: Mark Thomas 
AuthorDate: Wed Feb 1 18:07:51 2023 +

Update recommended APR version to 1.7.1
---
 native/srclib/VERSIONS| 2 +-
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index 4fb768ffa..a9b86ea85 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -4,7 +4,7 @@ The current minimum versions are:
 
 The following version of the libraries are recommended:
 
-- APR 1.7.0 or later, http://apr.apache.org
+- APR 1.7.1 or later, http://apr.apache.org
 - OpenSSL 1.1.1q or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index b62290243..a9370be9a 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,9 @@
 
 
   
+
+  Update the recommended minimum version of APR to 1.7.1. (markt)
+
   
 
 


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

[tomcat-native] branch 1.2.x updated: Update EOL info

2023-02-01 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.2.x by this push:
 new beb696832 Update EOL info
beb696832 is described below

commit beb696832259f087a29ccab8aeb434a1bc96ecb0
Author: Mark Thomas 
AuthorDate: Wed Feb 1 18:11:11 2023 +

Update EOL info
---
 native/srclib/VERSIONS | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index a9b86ea85..f4acf26de 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -12,20 +12,18 @@ Native team
 
 
 It is current anticipated that Tomcat Native releases will transition to 1.3.x
-after April 2021 when the minimum version will become OpenSSL 1.1.0 and
-APR 1.5.2.
+at some point in the future when the minimum version will become OpenSSL 1.1.1 
and
+APR 1.6.3.
 
 
 The minimum version of OpenSSL is driven by the version of OpenSSL used by
 downstream distributions.
 
 The current state of OpenSSL in Debian is:
-- OpenSSL 1.1.0l in Debian 9  (EOL end June 2022)
 - OpenSSL 1.1.1n in Debian 10 (EOL end June 2024)
 - OpenSSL 1.1.1n in Debian 11 (EOL end June 2026)
 
 And in Ubuntu:
-- OpenSSL 1.0.2g in Ubuntu 16.04 LTS (EOL in April 2021)
 - OpenSSL 1.1.1  in Ubuntu 18.04 LTS (EOL in April 2028)
 - OpenSSL 1.1.1f in Ubuntu 20.04 LTS (EOL in April 2030)
 - OpenSSL 3.0.2  in Ubuntu 22.04 LTS (EOL in April 2032)
@@ -34,11 +32,10 @@ The minimum version of APR is driven by the version of APR 
used by
 downstream distributions.
 
 The current state of APR in Debian is:
-- APR 1.5.2 in Debian 9 (EOL in June 2022)
-- APR 1.6.5 in Debian 10
+- APR 1.6.5 in Debian 10 (EOL end June 2024)
+- APR 1.7.0 in Debian 11 (EOL end June 2026)
 
 And in Ubuntu:
-- APR 1.5.2 in Ubuntu 16.04 LTS (EOL in April 2021)
 - APR 1.6.3 in Ubuntu 18.04 LTS (EOL in April 2028)
 - APR 1.6.5 in Ubuntu 20.04 LTS (EOL in April 2030)
 - APR 1.7.0 in Ubuntu 22.04 LTS (EOL in April 2032)


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

[tomcat] branch main updated: Align async close implementation with Servlet 6.1 clarification

2023-02-01 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 e1fb169adb Align async close implementation with Servlet 6.1 
clarification
e1fb169adb is described below

commit e1fb169adb953e826fecb4b15a178636aa7c3a13
Author: Mark Thomas 
AuthorDate: Tue Dec 13 11:22:51 2022 +

Align async close implementation with Servlet 6.1 clarification

Includes a test case
---
 java/org/apache/coyote/AbstractProcessor.java  |   8 +-
 java/org/apache/coyote/AbstractProcessorLight.java |   2 +-
 java/org/apache/coyote/AsyncStateMachine.java  |   9 +-
 .../apache/coyote/http11/Http11OutputBuffer.java   |   9 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 157 +
 webapps/docs/changelog.xml |  11 +-
 6 files changed, 182 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index 50743ffece..6d3be069c7 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -193,7 +193,7 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 
 
 @Override
-public SocketState asyncPostProcess() {
+public SocketState asyncPostProcess() throws IOException {
 return asyncStateMachine.asyncPostProcess();
 }
 
@@ -570,7 +570,11 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 break;
 }
 case ASYNC_POST_PROCESS: {
-asyncStateMachine.asyncPostProcess();
+try {
+asyncStateMachine.asyncPostProcess();
+} catch (IOException e) {
+handleIOException(e);
+}
 break;
 }
 
diff --git a/java/org/apache/coyote/AbstractProcessorLight.java 
b/java/org/apache/coyote/AbstractProcessorLight.java
index 709530dfc8..9ba345fa66 100644
--- a/java/org/apache/coyote/AbstractProcessorLight.java
+++ b/java/org/apache/coyote/AbstractProcessorLight.java
@@ -192,7 +192,7 @@ public abstract class AbstractProcessorLight implements 
Processor {
  */
 protected abstract SocketState dispatch(SocketEvent status) throws 
IOException;
 
-protected abstract SocketState asyncPostProcess();
+protected abstract SocketState asyncPostProcess() throws IOException;
 
 protected abstract Log getLog();
 }
diff --git a/java/org/apache/coyote/AsyncStateMachine.java 
b/java/org/apache/coyote/AsyncStateMachine.java
index b400788831..50b16316a9 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -16,6 +16,7 @@
  */
 package org.apache.coyote;
 
+import java.io.IOException;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.juli.logging.Log;
@@ -264,7 +265,7 @@ class AsyncStateMachine {
  * current state. For example, as per SRV.2.3.3.3 can now process calls to
  * complete() or dispatch().
  */
-synchronized SocketState asyncPostProcess() {
+synchronized SocketState asyncPostProcess() throws IOException {
 if (state == AsyncState.COMPLETE_PENDING) {
 clearNonBlockingListeners();
 updateState(AsyncState.COMPLETING);
@@ -277,6 +278,9 @@ class AsyncStateMachine {
 updateState(AsyncState.STARTED);
 return SocketState.LONG;
 } else if (state == AsyncState.MUST_COMPLETE || state == 
AsyncState.COMPLETING) {
+if (processor.getErrorState().isIoAllowed() && 
processor.flushBufferedWrite()) {
+return SocketState.LONG;
+}
 asyncCtxt.fireOnComplete();
 updateState(AsyncState.DISPATCHED);
 asyncCtxt.decrementInProgressAsyncCount();
@@ -285,6 +289,9 @@ class AsyncStateMachine {
 updateState(AsyncState.DISPATCHING);
 return SocketState.ASYNC_END;
 } else if (state == AsyncState.DISPATCHING) {
+if (processor.getErrorState().isIoAllowed() && 
processor.flushBufferedWrite()) {
+return SocketState.LONG;
+}
 updateState(AsyncState.DISPATCHED);
 asyncCtxt.decrementInProgressAsyncCount();
 return SocketState.ASYNC_END;
diff --git a/java/org/apache/coyote/http11/Http11OutputBuffer.java 
b/java/org/apache/coyote/http11/Http11OutputBuffer.java
index 570b90c0d7..e7206a50bd 100644
--- a/java/org/apache/coyote/http11/Http11OutputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11OutputBuffer.java
@@ -565,14 +565,7 @@ public class Http11OutputBuffer implements 
HttpOutputBuffer {
 
 @Override
 public void end() throws IOException {
-/*
- * TODO
- * As of Servlet 6.1, this flush is (currently) meant

Re: [tomcat-native] branch 1.2.x updated: Update EOL info

2023-02-01 Thread Mark Thomas 

On 01/02/2023 18:11, ma...@apache.org wrote:




It is current anticipated that Tomcat Native releases will transition to 1.3.x
at some point in the future when the minimum version will become OpenSSL 1.1.1 
and
APR 1.6.3.


Given the various EOL dates, these minimum versions are unlikely to 
change for a number of years.


We can transition to Tomcat Native 1.3.0 whenever we wish. The question 
is do we want to?


The benefits are that we'd be able to remove the conditional compilation 
currently in place for the older OpenSSL versions. Whilst I like code 
clean up as much as the next developer (actually probably more) I don't 
see a pressing need to make the switch to 1.3.0 at this point.


Thoughts?

Mark

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

Re: [tomcat-native] branch main updated: Update recommended APR version to 1.7.1

2023-02-01 Thread Rainer Jung 
APR 1.7.1 will be replaced by 1.7.2, because in 1.7.1 the tarball was 
rolled with a directory containing an RC verion in its name.


So 1.7.2 will be the same source code as 1.7.1, but with a packaging 
failure fixed.


The release is expected to happen either later today or tomorrow.

Best regards,

Rainer


-
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

2023-02-01 Thread buildbot 
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/168
Blamelist: Mark Thomas 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] e1fb169adb953e826fecb4b15a178636aa7c3a13


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

Re: [tomcat-native] branch main updated: Update recommended APR version to 1.7.1

2023-02-01 Thread Mark Thomas 

On 01/02/2023 18:33, Rainer Jung wrote:
APR 1.7.1 will be replaced by 1.7.2, because in 1.7.1 the tarball was 
rolled with a directory containing an RC verion in its name.


So 1.7.2 will be the same source code as 1.7.1, but with a packaging 
failure fixed.


The release is expected to happen either later today or tomorrow.


Thanks for the heads up. I'll update the recommendation to 1.7.2 before 
tagging.


Mark

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