[Bug 68092] New: Failed to connect database after upgrading to tomcat-8.5.94 in linux
https://bz.apache.org/bugzilla/show_bug.cgi?id=68092 Bug ID: 68092 Summary: Failed to connect database after upgrading to tomcat-8.5.94 in linux Product: Tomcat 8 Version: 8.5.94 Hardware: All OS: Linux Status: NEW Severity: critical Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: hong...@cisco.com Target Milestone: After upgrading to tomcat-8.5.94, connect database failed, error log as following: Error querying database. Cause: org.apache.tomcat.jdbc.pool.PoolExhaustedException: [DefaultQuartzScheduler_Worker-4] Timeout: Pool empty. Unable to fetch a connection in 10 seconds, none available[size:80; busy:80; idle:0; lastwait:1]. after check, we found tomcat-jdbc.jar file size is different in tomcat-8.5.93 and tomcat-8.5.94. tomcat-jdbc.jar has 149414 byte in tomcat-8.5.94 but has 298753 byte in tomcat-8.5.94. Then we copy tomcat-jdbc.jar from tomcat-8.5.93 to overwrite tomcat-8.5.94, then it works. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Added support for JDBC 4.3 beginRequest and endRequest methods. [tomcat]
aooohan commented on code in PR #677:
URL: https://github.com/apache/tomcat/pull/677#discussion_r1384334368
##
modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectionBoundariesTest.java:
##
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import org.apache.tomcat.jdbc.test.driver.Driver;
+
+import java.sql.Connection;
+
+import org.junit.Test;
+import org.junit.Assert;
+
+public class ConnectionBoundariesTest extends DefaultTestCase {
+
+
+@Override
+public org.apache.tomcat.jdbc.pool.DataSource createDefaultDataSource() {
+// TODO Auto-generated method stub
+org.apache.tomcat.jdbc.pool.DataSource ds =
super.createDefaultDataSource();
+ds.getPoolProperties().setDriverClassName(Driver.class.getName());
+ds.getPoolProperties().setUrl(Driver.url);
+ds.getPoolProperties().setInitialSize(0);
+ds.getPoolProperties().setMaxIdle(10);
+ds.getPoolProperties().setMinIdle(10);
+ds.getPoolProperties().setMaxActive(10);
+return ds;
+}
+@Test
+public void connectionWithRequestBoundariesTest() throws Exception {
+
datasource.getPoolProperties().getDbProperties().setProperty("requestBoundaries",
"true");
Review Comment:
What does this parameter do, and where is it used?
##
modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java:
##
@@ -812,6 +829,28 @@ protected PooledConnection createConnection(long now,
PooledConnection notUsed,
}//catch
}
+/**
+ * If request boundaries are not initialised, checks if beginRequest and
+ * endRequest methods are implemented on connection object.
+ *
+ * @param connection The connection
+ * @return Returns true if connection is not null and connection
implements
+ * JDBC 4.3 beginRequest and endRequest methods
+ */
+private boolean hasRequestBoundaryMethods(Connection connection) {
+if (!requestBoundaryMethodsInitialised && connection != null) {
+try {
+beginRequest = connection.getClass().getMethod("beginRequest");
+endRequest = connection.getClass().getMethod("endRequest");
+} catch (NoSuchMethodException ex) {
+// begin and end request not implemented, ignore exception
+} finally {
+requestBoundaryMethodsInitialised = true;
Review Comment:
Maybe this block move to static block and assign to some static variables is
better?
--
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
[Bug 68089] ApplicationHttpRequest.getSpecial() and removeSpecial() use linear scans
https://bz.apache.org/bugzilla/show_bug.cgi?id=68089 Anurag Dubey changed: What|Removed |Added CC||anura...@amazon.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-11.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/734 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] ea660de4f2ca1e5c38bced88c95b304fed335856 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: 1 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
[Bug 68089] New: ApplicationHttpRequest.getSpecial() and removeSpecial() use linear scans
https://bz.apache.org/bugzilla/show_bug.cgi?id=68089
Bug ID: 68089
Summary: ApplicationHttpRequest.getSpecial() and
removeSpecial() use linear scans
Product: Tomcat 9
Version: 9.0.x
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: jeng...@amazon.com
Target Milestone: -
A high-volume, latency-sensitive application shows a large amount of
String.equals() calls buried inside tomcat processing. Detailed examination
shows that much of it comes from ApplicationHttpRequest.getSpecial() and
removeSpecial(), which are called once per call to request.setAttribute() or
request.removeAttribute(). In our application these calls are from certain
Filters or, more commonly, AstExpressions, especially those which are not
otherwise resolved.
The relevant code is:
protected static final String specials[] =
{ ... };
protected int getSpecial(String name) {
for (int i = 0; i < specials.length; i++) {
if (specials[i].equals(name)) {
return i;
}
}
return -1;
}
The array contains 12 specials, so each call to request.getAttribute(), etc.
performs 12 String comparisons. The occasional search of an actual special
will reduce that, but very few of our calls match.
Suggestion: use a HashMap or enums to achieve a similar
purpose. Comparable performance data may be found at
https://bz.apache.org/bugzilla/show_bug.cgi?id=67080.
These scans are largely inlined into calling methods so I cannot reliably
estimate the cpu or clock impact, however the sheer number of calls is
impressive.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68035] Deploying a directory from Host appBase fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #4 from Mark Thomas --- Fixed in: - 11.0.x for 11.0.0-M14 onwards - 10.1.x for 10.1.16 onwards - 9.0.x for 9.0.83 onwards Note 8.5.x was not affected -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix BZ 68035 - allow deployment from appBase or xmlBase
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 a81bcf07d8 Fix BZ 68035 - allow deployment from appBase or xmlBase
a81bcf07d8 is described below
commit a81bcf07d8f9b2f88b7a672b8e03a6d7bf10025e
Author: Mark Thomas
AuthorDate: Mon Nov 6 19:40:13 2023 +
Fix BZ 68035 - allow deployment from appBase or xmlBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035
---
.../apache/catalina/manager/ManagerServlet.java| 32 ++
webapps/docs/changelog.xml | 10 +++
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index c09dbe5647..ea89e4439f 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -932,25 +932,33 @@ public class ManagerServlet extends HttpServlet
implements ContainerServlet {
writer.println(smClient.getString("managerServlet.mkdirFail", configBase));
return;
}
-File localConfig = new File(configBase, baseName +
".xml");
-if (localConfig.isFile() && !localConfig.delete()) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localConfig));
-return;
+File localConfigFile = new File(configBase, baseName +
".xml");
+File configFile = new File(config);
+// Skip delete and copy if source == destination
+if
(!configFile.getCanonicalPath().equals(localConfigFile.getCanonicalPath())) {
+if (localConfigFile.isFile() &&
!localConfigFile.delete()) {
+
writer.println(smClient.getString("managerServlet.deleteFail",
localConfigFile));
+return;
+}
+ExpandWar.copy(configFile, localConfigFile);
}
-ExpandWar.copy(new File(config), localConfig);
}
if (war != null) {
-File localWar;
+File localWarFile;
if (war.endsWith(".war")) {
-localWar = new File(host.getAppBaseFile(),
baseName + ".war");
+localWarFile = new File(host.getAppBaseFile(),
baseName + ".war");
} else {
-localWar = new File(host.getAppBaseFile(),
baseName);
+localWarFile = new File(host.getAppBaseFile(),
baseName);
}
-if (localWar.exists() && !ExpandWar.delete(localWar)) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localWar));
-return;
+File warFile = new File(war);
+// Skip delete and copy if source == destination
+if
(!warFile.getCanonicalPath().equals(localWarFile.getCanonicalPath())) {
+if (localWarFile.exists() &&
!ExpandWar.delete(localWarFile)) {
+
writer.println(smClient.getString("managerServlet.deleteFail", localWarFile));
+return;
+}
+ExpandWar.copy(warFile, localWarFile);
}
-ExpandWar.copy(new File(war), localWar);
}
} finally {
removeServiced(name);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef17aee76b..8df7bf0490 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,16 @@
+
+
+
+68035: Correct a regression in the fix for 56248
+that prevented deployment via the Manager of a WAR or directory that
was
+already present in the appBase or a context file that was
+already present in the xmlBase. (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: Fix BZ 68035 - allow deployment from appBase or xmlBase
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 70ad562033 Fix BZ 68035 - allow deployment from appBase or xmlBase
70ad562033 is described below
commit 70ad562033670cea8400f9aaf848581c3fbd20ab
Author: Mark Thomas
AuthorDate: Mon Nov 6 19:40:13 2023 +
Fix BZ 68035 - allow deployment from appBase or xmlBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035
---
.../apache/catalina/manager/ManagerServlet.java| 32 ++
webapps/docs/changelog.xml | 10 +++
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 096c6438ba..e0c087b587 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -933,25 +933,33 @@ public class ManagerServlet extends HttpServlet
implements ContainerServlet {
writer.println(smClient.getString("managerServlet.mkdirFail", configBase));
return;
}
-File localConfig = new File(configBase, baseName +
".xml");
-if (localConfig.isFile() && !localConfig.delete()) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localConfig));
-return;
+File localConfigFile = new File(configBase, baseName +
".xml");
+File configFile = new File(config);
+// Skip delete and copy if source == destination
+if
(!configFile.getCanonicalPath().equals(localConfigFile.getCanonicalPath())) {
+if (localConfigFile.isFile() &&
!localConfigFile.delete()) {
+
writer.println(smClient.getString("managerServlet.deleteFail",
localConfigFile));
+return;
+}
+ExpandWar.copy(configFile, localConfigFile);
}
-ExpandWar.copy(new File(config), localConfig);
}
if (war != null) {
-File localWar;
+File localWarFile;
if (war.endsWith(".war")) {
-localWar = new File(host.getAppBaseFile(),
baseName + ".war");
+localWarFile = new File(host.getAppBaseFile(),
baseName + ".war");
} else {
-localWar = new File(host.getAppBaseFile(),
baseName);
+localWarFile = new File(host.getAppBaseFile(),
baseName);
}
-if (localWar.exists() && !ExpandWar.delete(localWar)) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localWar));
-return;
+File warFile = new File(war);
+// Skip delete and copy if source == destination
+if
(!warFile.getCanonicalPath().equals(localWarFile.getCanonicalPath())) {
+if (localWarFile.exists() &&
!ExpandWar.delete(localWarFile)) {
+
writer.println(smClient.getString("managerServlet.deleteFail", localWarFile));
+return;
+}
+ExpandWar.copy(warFile, localWarFile);
}
-ExpandWar.copy(new File(war), localWar);
}
} finally {
removeServiced(name);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ba915c7bb6..b3a972a0ea 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -192,6 +192,16 @@
+
+
+
+68035: Correct a regression in the fix for 56248
+that prevented deployment via the Manager of a WAR or directory that
was
+already present in the appBase or a context file that was
+already present in the xmlBase. (markt)
+
+
+
-
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 68035 - allow deployment from appBase or xmlBase
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 ea660de4f2 Fix BZ 68035 - allow deployment from appBase or xmlBase
ea660de4f2 is described below
commit ea660de4f2ca1e5c38bced88c95b304fed335856
Author: Mark Thomas
AuthorDate: Mon Nov 6 19:40:13 2023 +
Fix BZ 68035 - allow deployment from appBase or xmlBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035
---
.../apache/catalina/manager/ManagerServlet.java| 32 ++
webapps/docs/changelog.xml | 10 +++
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 096c6438ba..e0c087b587 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -933,25 +933,33 @@ public class ManagerServlet extends HttpServlet
implements ContainerServlet {
writer.println(smClient.getString("managerServlet.mkdirFail", configBase));
return;
}
-File localConfig = new File(configBase, baseName +
".xml");
-if (localConfig.isFile() && !localConfig.delete()) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localConfig));
-return;
+File localConfigFile = new File(configBase, baseName +
".xml");
+File configFile = new File(config);
+// Skip delete and copy if source == destination
+if
(!configFile.getCanonicalPath().equals(localConfigFile.getCanonicalPath())) {
+if (localConfigFile.isFile() &&
!localConfigFile.delete()) {
+
writer.println(smClient.getString("managerServlet.deleteFail",
localConfigFile));
+return;
+}
+ExpandWar.copy(configFile, localConfigFile);
}
-ExpandWar.copy(new File(config), localConfig);
}
if (war != null) {
-File localWar;
+File localWarFile;
if (war.endsWith(".war")) {
-localWar = new File(host.getAppBaseFile(),
baseName + ".war");
+localWarFile = new File(host.getAppBaseFile(),
baseName + ".war");
} else {
-localWar = new File(host.getAppBaseFile(),
baseName);
+localWarFile = new File(host.getAppBaseFile(),
baseName);
}
-if (localWar.exists() && !ExpandWar.delete(localWar)) {
-
writer.println(smClient.getString("managerServlet.deleteFail", localWar));
-return;
+File warFile = new File(war);
+// Skip delete and copy if source == destination
+if
(!warFile.getCanonicalPath().equals(localWarFile.getCanonicalPath())) {
+if (localWarFile.exists() &&
!ExpandWar.delete(localWarFile)) {
+
writer.println(smClient.getString("managerServlet.deleteFail", localWarFile));
+return;
+}
+ExpandWar.copy(warFile, localWarFile);
}
-ExpandWar.copy(new File(war), localWar);
}
} finally {
removeServiced(name);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f64374e2f2..a39a4281b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -210,6 +210,16 @@
+
+
+
+68035: Correct a regression in the fix for 56248
+that prevented deployment via the Manager of a WAR or directory that
was
+already present in the appBase or a context file that was
+already present in the xmlBase. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68026] org.apache.tomcat.buf.MessageBytes.toString() is no longuer cached
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026 --- Comment #6 from lucas.pou...@lpoconseil.fr --- Thanks for your quick fix. But if you call toStringType() and after toString() method, your toString() method has not the same result because type attribute has been updated. Maybe it's necessary to take a specific cache in toStringType() without call setString() method ? On the other hand, this should fix the memory consumption problem. -- 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-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/733 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch main] bec0dc510eee2dd1587cf3c51a56ed69f5f63da0 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
[Bug 68035] Deploying a directory from Host appBase fails
https://bz.apache.org/bugzilla/show_bug.cgi?id=68035 Mark Thomas changed: What|Removed |Added Severity|enhancement |normal --- Comment #3 from Mark Thomas --- Changing this back to a bug as it is documented to work and it has worked in previous versions. It looks like it was broken by this commit: https://github.com/apache/tomcat/commit/1f9b47ed2a9ad9039b8a83fa77f2b5ca836f4480 which doesn't consider the src == dest case -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68026] org.apache.tomcat.buf.MessageBytes.toString() is no longuer cached
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Mark Thomas --- Fixed in: - 11.0.x for 11.0.0-M14 onwards - 10.1.x for 10.1.16 onwards - 9.0.x for 9.0.83 onwards - 8.5.x for 8.5.96 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix BZ 68026 - Convert selected MessageBytes values to String type
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 da1149391f Fix BZ 68026 - Convert selected MessageBytes values to
String type
da1149391f is described below
commit da1149391f83bcaced93cc0c6b0476a7efde31e1
Author: Mark Thomas
AuthorDate: Mon Nov 6 17:10:56 2023 +
Fix BZ 68026 - Convert selected MessageBytes values to String type
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026
---
java/org/apache/catalina/connector/Request.java | 10 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 24 +++
webapps/docs/changelog.xml| 9 +++--
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index dcf037a140..4955e49fa7 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1216,7 +1216,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getProtocol() {
-return coyoteRequest.protocol().toString();
+return coyoteRequest.protocol().toStringType();
}
@@ -1448,7 +1448,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getScheme() {
-return coyoteRequest.scheme().toString();
+return coyoteRequest.scheme().toStringType();
}
@@ -2293,7 +2293,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getMethod() {
-return coyoteRequest.method().toString();
+return coyoteRequest.method().toStringType();
}
@@ -2302,7 +2302,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getPathInfo() {
-return mappingData.pathInfo.toString();
+return mappingData.pathInfo.toStringType();
}
@@ -2387,7 +2387,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getServletPath() {
-return mappingData.wrapperPath.toString();
+return mappingData.wrapperPath.toStringType();
}
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 0d23e1d602..10e34d406a 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -180,6 +180,30 @@ public final class MessageBytes implements Cloneable,
Serializable {
return strValue;
}
+
+/**
+ * Convert to String (if not already of the String type) and then return
the String value.
+ *
+ * @return The current value as a String
+ */
+public String toStringType() {
+switch (type) {
+case T_NULL:
+case T_STR:
+// No conversion required
+break;
+case T_BYTES:
+setString(byteC.toString());
+break;
+case T_CHARS:
+setString(charC.toString());
+break;
+}
+
+return strValue;
+}
+
+
//
/**
* Return the type of the original content. Can be T_STR, T_BYTES, T_CHARS
or T_NULL
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ebc7c43140..a538221fe9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,8 +179,13 @@
does not. (markt)
-67938: Correct handling of large TLS client hello messages
that
-were causing the TLS handshake to fail. (markt)
+67938: Correct handling of large TLS client hello messages
+that were causing the TLS handshake to fail. (markt)
+
+
+68026: Convert selected MessageByte values to
+String when first accessed to speed up subsequent accesses and reduce
+garbage collection. (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: Fix BZ 68026 - Convert selected MessageBytes values to String type
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 b06cbf8955 Fix BZ 68026 - Convert selected MessageBytes values to
String type
b06cbf8955 is described below
commit b06cbf8955e5d3f836ca52faba89d235648cc411
Author: Mark Thomas
AuthorDate: Mon Nov 6 17:10:56 2023 +
Fix BZ 68026 - Convert selected MessageBytes values to String type
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026
---
java/org/apache/catalina/connector/Request.java | 10 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 24 +++
webapps/docs/changelog.xml| 9 +++--
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index e5fb06f152..2f799d62c1 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1188,7 +1188,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getProtocol() {
-return coyoteRequest.protocol().toString();
+return coyoteRequest.protocol().toStringType();
}
@@ -1438,7 +1438,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getScheme() {
-return coyoteRequest.scheme().toString();
+return coyoteRequest.scheme().toStringType();
}
@@ -2302,7 +2302,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getMethod() {
-return coyoteRequest.method().toString();
+return coyoteRequest.method().toStringType();
}
@@ -2311,7 +2311,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getPathInfo() {
-return mappingData.pathInfo.toString();
+return mappingData.pathInfo.toStringType();
}
@@ -2396,7 +2396,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getServletPath() {
-return mappingData.wrapperPath.toString();
+return mappingData.wrapperPath.toStringType();
}
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index f678b77f92..0eee6e75d4 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -180,6 +180,30 @@ public final class MessageBytes implements Cloneable,
Serializable {
return strValue;
}
+
+/**
+ * Convert to String (if not already of the String type) and then return
the String value.
+ *
+ * @return The current value as a String
+ */
+public String toStringType() {
+switch (type) {
+case T_NULL:
+case T_STR:
+// No conversion required
+break;
+case T_BYTES:
+setString(byteC.toString());
+break;
+case T_CHARS:
+setString(charC.toString());
+break;
+}
+
+return strValue;
+}
+
+
//
/**
* Return the type of the original content. Can be T_STR, T_BYTES, T_CHARS
or T_NULL
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 43ca6513ef..ef17aee76b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -179,8 +179,13 @@
does not. (markt)
-67938: Correct handling of large TLS client hello messages
that
-were causing the TLS handshake to fail. (markt)
+67938: Correct handling of large TLS client hello messages
+that were causing the TLS handshake to fail. (markt)
+
+
+68026: Convert selected MessageByte values to
+String when first accessed to speed up subsequent accesses and reduce
+garbage collection. (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: Fix BZ 68026 - Convert selected MessageBytes values to String type
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 453e09ee0d Fix BZ 68026 - Convert selected MessageBytes values to
String type
453e09ee0d is described below
commit 453e09ee0d3fb7019efd249d7998c26a11683b43
Author: Mark Thomas
AuthorDate: Mon Nov 6 17:10:56 2023 +
Fix BZ 68026 - Convert selected MessageBytes values to String type
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026
---
java/org/apache/catalina/connector/Request.java | 10 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 24 +++
webapps/docs/changelog.xml| 9 +++--
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 88bb9bc822..935a38d932 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1159,7 +1159,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getProtocol() {
-return coyoteRequest.protocol().toString();
+return coyoteRequest.protocol().toStringType();
}
@@ -1381,7 +1381,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getScheme() {
-return coyoteRequest.scheme().toString();
+return coyoteRequest.scheme().toStringType();
}
@@ -2264,7 +2264,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getMethod() {
-return coyoteRequest.method().toString();
+return coyoteRequest.method().toStringType();
}
@@ -2273,7 +2273,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getPathInfo() {
-return mappingData.pathInfo.toString();
+return mappingData.pathInfo.toStringType();
}
@@ -2358,7 +2358,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getServletPath() {
-return mappingData.wrapperPath.toString();
+return mappingData.wrapperPath.toStringType();
}
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index f678b77f92..0eee6e75d4 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -180,6 +180,30 @@ public final class MessageBytes implements Cloneable,
Serializable {
return strValue;
}
+
+/**
+ * Convert to String (if not already of the String type) and then return
the String value.
+ *
+ * @return The current value as a String
+ */
+public String toStringType() {
+switch (type) {
+case T_NULL:
+case T_STR:
+// No conversion required
+break;
+case T_BYTES:
+setString(byteC.toString());
+break;
+case T_CHARS:
+setString(charC.toString());
+break;
+}
+
+return strValue;
+}
+
+
//
/**
* Return the type of the original content. Can be T_STR, T_BYTES, T_CHARS
or T_NULL
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d71eb9e23f..ba915c7bb6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,8 +174,13 @@
refuse new connections or the JVM to crash. (markt)
-67938: Correct handling of large TLS client hello messages
that
-were causing the TLS handshake to fail. (markt)
+67938: Correct handling of large TLS client hello messages
+that were causing the TLS handshake to fail. (markt)
+
+
+68026: Convert selected MessageByte values to
+String when first accessed to speed up subsequent accesses and reduce
+garbage collection. (markt)
-
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 68026 - Convert selected MessageBytes values to String type
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 bec0dc510e Fix BZ 68026 - Convert selected MessageBytes values to
String type
bec0dc510e is described below
commit bec0dc510eee2dd1587cf3c51a56ed69f5f63da0
Author: Mark Thomas
AuthorDate: Mon Nov 6 17:10:56 2023 +
Fix BZ 68026 - Convert selected MessageBytes values to String type
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026
---
java/org/apache/catalina/connector/Request.java | 10 +-
java/org/apache/tomcat/util/buf/MessageBytes.java | 24 +++
webapps/docs/changelog.xml| 9 +++--
3 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index aa67ec5df5..bda5dc2da4 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1112,7 +1112,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getProtocol() {
-return coyoteRequest.protocol().toString();
+return coyoteRequest.protocol().toStringType();
}
@@ -1334,7 +1334,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getScheme() {
-return coyoteRequest.scheme().toString();
+return coyoteRequest.scheme().toStringType();
}
@@ -2167,7 +2167,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getMethod() {
-return coyoteRequest.method().toString();
+return coyoteRequest.method().toStringType();
}
@@ -2176,7 +2176,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getPathInfo() {
-return mappingData.pathInfo.toString();
+return mappingData.pathInfo.toStringType();
}
@@ -2261,7 +2261,7 @@ public class Request implements HttpServletRequest {
*/
@Override
public String getServletPath() {
-return mappingData.wrapperPath.toString();
+return mappingData.wrapperPath.toStringType();
}
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java
b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 10a6016ba4..0de3053c24 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -179,6 +179,30 @@ public final class MessageBytes implements Cloneable,
Serializable {
return strValue;
}
+
+/**
+ * Convert to String (if not already of the String type) and then return
the String value.
+ *
+ * @return The current value as a String
+ */
+public String toStringType() {
+switch (type) {
+case T_NULL:
+case T_STR:
+// No conversion required
+break;
+case T_BYTES:
+setString(byteC.toString());
+break;
+case T_CHARS:
+setString(charC.toString());
+break;
+}
+
+return strValue;
+}
+
+
//
/**
* Return the type of the original content. Can be T_STR, T_BYTES, T_CHARS
or T_NULL
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9085d69063..f64374e2f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,8 +185,13 @@
refuse new connections or the JVM to crash. (markt)
-67938: Correct handling of large TLS client hello messages
that
-were causing the TLS handshake to fail. (markt)
+67938: Correct handling of large TLS client hello messages
+that were causing the TLS handshake to fail. (markt)
+
+
+68026: Convert selected MessageByte values to
+String when first accessed to speed up subsequent accesses and reduce
+garbage collection. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68026] org.apache.tomcat.buf.MessageBytes.toString() is no longuer cached
https://bz.apache.org/bugzilla/show_bug.cgi?id=68026 --- Comment #4 from Mark Thomas --- Changes to the behaviour of MessageBytes has previously introduced subtle bugs. I am therefore extremely reluctant to make the changes suggested in comment #0 or comment #3. Caching the values as suggested in comment #2 creates the risk that changes made to the underlying MessageBytes instance will not be seen. I don't think that is the case with request method but I'd prefer a more general solution. Rémy's suggestion in comment #1 should work. I'll implement that for request method. I'll look at the other MessageByte usages in coyote request and may update some of the other usages as well. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: HTTP methods are case sensitive - use consistent code for testing method
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 d45068fcaa HTTP methods are case sensitive - use consistent code for
testing method
d45068fcaa is described below
commit d45068fcaa441c67cd0be94c39cd8bff7c5e6ff2
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:10:24 2023 +
HTTP methods are case sensitive - use consistent code for testing method
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 +++---
java/org/apache/coyote/http2/Stream.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index e1e077a2b4..fec6822add 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -592,7 +592,7 @@ public class CoyoteAdapter implements Adapter {
// Check for ping OPTIONS * request
if (undecodedURI.equals("*")) {
-if (req.method().equalsIgnoreCase("OPTIONS")) {
+if (req.method().equals("OPTIONS")) {
StringBuilder allow = new StringBuilder();
allow.append("GET, HEAD, POST, PUT, DELETE, OPTIONS");
// Trace if allowed
@@ -611,7 +611,7 @@ public class CoyoteAdapter implements Adapter {
MessageBytes decodedURI = req.decodedURI();
// Filter CONNECT method
-if (req.method().equalsIgnoreCase("CONNECT")) {
+if (req.method().equals("CONNECT")) {
response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
sm.getString("coyoteAdapter.connect"));
} else {
// No URI for CONNECT requests
@@ -804,7 +804,7 @@ public class CoyoteAdapter implements Adapter {
}
// Filter TRACE method
-if (!connector.getAllowTrace() &&
req.method().equalsIgnoreCase("TRACE")) {
+if (!connector.getAllowTrace() && req.method().equals("TRACE")) {
Wrapper wrapper = request.getWrapper();
String header = null;
if (wrapper != null) {
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 091f468a67..cfbbf98929 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -524,7 +524,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final boolean receivedEndOfHeaders() throws ConnectionException {
if (coyoteRequest.method().isNull() || coyoteRequest.scheme().isNull()
||
-!coyoteRequest.method().equalsIgnoreCase("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
+!coyoteRequest.method().equals("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
throw new
ConnectionException(sm.getString("stream.header.required", getConnectionId(),
getIdAsString()),
Http2Error.PROTOCOL_ERROR);
}
-
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: HTTP methods are case sensitive - use consistent code for testing method
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 1ccdf4e773 HTTP methods are case sensitive - use consistent code for
testing method
1ccdf4e773 is described below
commit 1ccdf4e773f5ba1bdb10dac4134f1baed1c1f466
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:10:24 2023 +
HTTP methods are case sensitive - use consistent code for testing method
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 +++---
java/org/apache/coyote/http2/Stream.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 087cb0cfe3..7cd5b1246a 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -593,7 +593,7 @@ public class CoyoteAdapter implements Adapter {
// Check for ping OPTIONS * request
if (undecodedURI.equals("*")) {
-if (req.method().equalsIgnoreCase("OPTIONS")) {
+if (req.method().equals("OPTIONS")) {
StringBuilder allow = new StringBuilder();
allow.append("GET, HEAD, POST, PUT, DELETE, OPTIONS");
// Trace if allowed
@@ -612,7 +612,7 @@ public class CoyoteAdapter implements Adapter {
MessageBytes decodedURI = req.decodedURI();
// Filter CONNECT method
-if (req.method().equalsIgnoreCase("CONNECT")) {
+if (req.method().equals("CONNECT")) {
response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
sm.getString("coyoteAdapter.connect"));
} else {
// No URI for CONNECT requests
@@ -808,7 +808,7 @@ public class CoyoteAdapter implements Adapter {
}
// Filter TRACE method
-if (!connector.getAllowTrace() &&
req.method().equalsIgnoreCase("TRACE")) {
+if (!connector.getAllowTrace() && req.method().equals("TRACE")) {
Wrapper wrapper = request.getWrapper();
String header = null;
if (wrapper != null) {
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 74c6216387..bc12e98b70 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -533,7 +533,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final boolean receivedEndOfHeaders() throws ConnectionException {
if (coyoteRequest.method().isNull() || coyoteRequest.scheme().isNull()
||
-!coyoteRequest.method().equalsIgnoreCase("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
+!coyoteRequest.method().equals("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
throw new
ConnectionException(sm.getString("stream.header.required", getConnectionId(),
getIdAsString()),
Http2Error.PROTOCOL_ERROR);
}
-
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: HTTP methods are case sensitive - use consistent code for testing method
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 d4f7f427ec HTTP methods are case sensitive - use consistent code for
testing method
d4f7f427ec is described below
commit d4f7f427ec31f5159ec6e23a3d319b5253f031bf
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:10:24 2023 +
HTTP methods are case sensitive - use consistent code for testing method
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 +++---
java/org/apache/coyote/http2/Stream.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 471d2d6da4..f60c44d3be 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -591,7 +591,7 @@ public class CoyoteAdapter implements Adapter {
// Check for ping OPTIONS * request
if (undecodedURI.equals("*")) {
-if (req.method().equalsIgnoreCase("OPTIONS")) {
+if (req.method().equals("OPTIONS")) {
StringBuilder allow = new StringBuilder();
allow.append("GET, HEAD, POST, PUT, DELETE, OPTIONS");
// Trace if allowed
@@ -610,7 +610,7 @@ public class CoyoteAdapter implements Adapter {
MessageBytes decodedURI = req.decodedURI();
// Filter CONNECT method
-if (req.method().equalsIgnoreCase("CONNECT")) {
+if (req.method().equals("CONNECT")) {
response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
sm.getString("coyoteAdapter.connect"));
} else {
// No URI for CONNECT requests
@@ -809,7 +809,7 @@ public class CoyoteAdapter implements Adapter {
}
// Filter TRACE method
-if (!connector.getAllowTrace() &&
req.method().equalsIgnoreCase("TRACE")) {
+if (!connector.getAllowTrace() && req.method().equals("TRACE")) {
Wrapper wrapper = request.getWrapper();
String header = null;
if (wrapper != null) {
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index fbe67a6e69..eac438d25f 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -535,7 +535,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final boolean receivedEndOfHeaders() throws ConnectionException {
if (coyoteRequest.method().isNull() || coyoteRequest.scheme().isNull()
||
-!coyoteRequest.method().equalsIgnoreCase("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
+!coyoteRequest.method().equals("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
throw new
ConnectionException(sm.getString("stream.header.required", getConnectionId(),
getIdAsString()),
Http2Error.PROTOCOL_ERROR);
}
-
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: Simplify (aligns with similar usages)
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 88ac7c24f0 Simplify (aligns with similar usages)
88ac7c24f0 is described below
commit 88ac7c24f006813f8b70cd0662e58238a03286d9
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:07:49 2023 +
Simplify (aligns with similar usages)
---
java/org/apache/coyote/http11/Http11Processor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index b8a06c9e19..4c8fee89e8 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1128,8 +1128,7 @@ public class Http11Processor extends AbstractProcessor {
}
}
-MessageBytes methodMB = request.method();
-if (methodMB.equals("HEAD")) {
+if (request.method().equals("HEAD")) {
// No entity body
outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
contentDelimitation = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Simplify (aligns with similar usages)
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 5f0768 Simplify (aligns with similar usages)
5f0768 is described below
commit 5f076823fe87939ff021a16c9cd9f052f13e
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:07:49 2023 +
Simplify (aligns with similar usages)
---
java/org/apache/coyote/http11/Http11Processor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 5b84ec3cc7..1f4ccb94b5 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -903,8 +903,7 @@ public class Http11Processor extends AbstractProcessor {
}
}
-MessageBytes methodMB = request.method();
-if (methodMB.equals("HEAD")) {
+if (request.method().equals("HEAD")) {
// No entity body
outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
contentDelimitation = true;
-
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: Simplify (aligns with similar usages)
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 c3d7d164c1 Simplify (aligns with similar usages)
c3d7d164c1 is described below
commit c3d7d164c1900a3eeaff6c50891277800d94efe7
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:07:49 2023 +
Simplify (aligns with similar usages)
---
java/org/apache/coyote/http11/Http11Processor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index d3bc2a8f37..1595750932 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -902,8 +902,7 @@ public class Http11Processor extends AbstractProcessor {
}
}
-MessageBytes methodMB = request.method();
-if (methodMB.equals("HEAD")) {
+if (request.method().equals("HEAD")) {
// No entity body
outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
contentDelimitation = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65111] Possible memory leak in AprEndpoint - socketBufferHandler is not cleared
https://bz.apache.org/bugzilla/show_bug.cgi?id=65111 --- Comment #2 from Roman --- Thanks, this solved the issue for me. -- 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 (4a2b481641 -> a127d7ecb1)
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 4a2b481641 Cleanup new e16eedd8ed Simplify (aligns with similar usages) new a127d7ecb1 HTTP methods are case sensitive - use consistent code for testing method The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/catalina/connector/CoyoteAdapter.java | 6 +++--- java/org/apache/coyote/http11/Http11Processor.java| 3 +-- java/org/apache/coyote/http2/Stream.java | 2 +- java/org/apache/coyote/http2/StreamProcessor.java | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: HTTP methods are case sensitive - use consistent code for testing method
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 a127d7ecb12dd9730635ad9c8bf85713253b5bb3
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:10:24 2023 +
HTTP methods are case sensitive - use consistent code for testing method
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 +++---
java/org/apache/coyote/http2/Stream.java | 2 +-
java/org/apache/coyote/http2/StreamProcessor.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index a85c703d81..f252a4a0f6 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -586,7 +586,7 @@ public class CoyoteAdapter implements Adapter {
// Check for ping OPTIONS * request
if (undecodedURI.equals("*")) {
-if (req.method().equalsIgnoreCase("OPTIONS")) {
+if (req.method().equals("OPTIONS")) {
StringBuilder allow = new StringBuilder();
allow.append("GET, HEAD, POST, PUT, DELETE, OPTIONS");
// Trace if allowed
@@ -605,7 +605,7 @@ public class CoyoteAdapter implements Adapter {
MessageBytes decodedURI = req.decodedURI();
// Filter CONNECT method
-if (req.method().equalsIgnoreCase("CONNECT")) {
+if (req.method().equals("CONNECT")) {
response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED,
sm.getString("coyoteAdapter.connect"));
} else {
// No URI for CONNECT requests
@@ -804,7 +804,7 @@ public class CoyoteAdapter implements Adapter {
}
// Filter TRACE method
-if (!connector.getAllowTrace() &&
req.method().equalsIgnoreCase("TRACE")) {
+if (!connector.getAllowTrace() && req.method().equals("TRACE")) {
Wrapper wrapper = request.getWrapper();
String header = null;
if (wrapper != null) {
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index e2300d5129..f94bc3a46e 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -529,7 +529,7 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
final boolean receivedEndOfHeaders() throws ConnectionException {
if (coyoteRequest.method().isNull() || coyoteRequest.scheme().isNull()
||
-!coyoteRequest.method().equalsIgnoreCase("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
+!coyoteRequest.method().equals("CONNECT") &&
coyoteRequest.requestURI().isNull()) {
throw new
ConnectionException(sm.getString("stream.header.required", getConnectionId(),
getIdAsString()),
Http2Error.PROTOCOL_ERROR);
}
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index be119cdd0d..bc5239b469 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -233,7 +233,7 @@ class StreamProcessor extends AbstractProcessor {
// Exclude some HTTP header fields where the value is determined only
// while generating the content as per section 9.3.2 of RFC 9110.
-if (coyoteRequest != null &&
"HEAD".equals(coyoteRequest.method().toString())) {
+if (coyoteRequest != null && coyoteRequest.method().equals("HEAD")) {
headers.removeHeader("content-length");
headers.removeHeader("content-range");
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Simplify (aligns with similar usages)
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 e16eedd8edf878b82851df803c8d7966d0ca644e
Author: Mark Thomas
AuthorDate: Mon Nov 6 16:07:49 2023 +
Simplify (aligns with similar usages)
---
java/org/apache/coyote/http11/Http11Processor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index 0a4a9e796a..67e53fafda 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -891,8 +891,7 @@ public class Http11Processor extends AbstractProcessor {
}
}
-MessageBytes methodMB = request.method();
-boolean head = methodMB.equals("HEAD");
+boolean head = request.method().equals("HEAD");
if (head) {
// No entity body
outputBuffer.addActiveFilter(outputFilters[Constants.VOID_FILTER]);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Added support for JDBC 4.3 beginRequest and endRequest methods. [tomcat]
fmeheust opened a new pull request, #677: URL: https://github.com/apache/tomcat/pull/677 JDBC 4.3 added the methods beginRequest and endRequest to java.sql.Connection. These methods hint the driver of the beginning and completion of a request (independent unit of work). Connection pooling manager should call these methods on the underlying connection prior to returning a connection to the caller, and when the applications returns the connection back to the connection pool respectively. This pull request adds support for beginRequest and endRequest methods to the Tomcat JDBC Connection Pool. -- 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: Cleanup
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 4a2b481641 Cleanup
4a2b481641 is described below
commit 4a2b481641444c06bee3a794a5172db50561ae74
Author: remm
AuthorDate: Mon Nov 6 15:50:43 2023 +0100
Cleanup
The callback will not be used with OpenSSL 3.
Also use the free macro.
---
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index f5855b4f2d..aeda3b0232 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -756,8 +756,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength)
public static MemorySegment openSSLCallbackTmpDH(MemorySegment ssl, int
isExport, int keylength) {
var pkey = SSL_get_privatekey(ssl);
-int type = (MemorySegment.NULL.equals(pkey)) ? EVP_PKEY_NONE()
-: (OPENSSL_3 ? EVP_PKEY_get_base_id(pkey) :
EVP_PKEY_base_id(pkey));
+int type = (MemorySegment.NULL.equals(pkey)) ? EVP_PKEY_NONE() :
EVP_PKEY_base_id(pkey);
/*
* OpenSSL will call us with either keylen == 512 or keylen == 1024
* (see the definition of SSL_EXPORT_PKEYLENGTH in ssl_locl.h).
@@ -772,7 +771,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
*/
int keylen = 0;
if (type == EVP_PKEY_RSA() || type == EVP_PKEY_DSA()) {
-keylen = (OPENSSL_3 ? EVP_PKEY_get_bits(pkey) :
EVP_PKEY_bits(pkey));
+keylen = EVP_PKEY_bits(pkey);
}
for (int i = 0; i < OpenSSLLibrary.dhParameters.length; i++) {
if (keylen >= OpenSSLLibrary.dhParameters[i].min) {
@@ -850,7 +849,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
}
MemorySegment buf = bufPointer.get(ValueLayout.ADDRESS, 0);
certificateChain[i] = buf.reinterpret(length, localArena,
null).toArray(ValueLayout.JAVA_BYTE);
-CRYPTO_free(buf, MemorySegment.NULL, 0); // OPENSSL_free macro
+OPENSSL_free(buf);
}
MemorySegment cipher = SSL_get_current_cipher(ssl);
String authMethod = (MemorySegment.NULL.equals(cipher)) ? "UNKNOWN"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68068] Hotspot in Ast*Nodes: itable method calls
https://bz.apache.org/bugzilla/show_bug.cgi?id=68068 --- Comment #1 from John Engebretson --- Perhaps a simpler solution is to change Node from an interface to an abstract class, then have SimpleNode extends Node rather than implement it. This achieves the same ends with more targeted and isolated changes. -- 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: Harmonize with Tomcat 9.0 change
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 9c198905bd Harmonize with Tomcat 9.0 change 9c198905bd is described below commit 9c198905bd8d66a0e9498fe71b383d14906bfb55 Author: remm AuthorDate: Mon Nov 6 14:22:12 2023 +0100 Harmonize with Tomcat 9.0 change --- build.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.xml b/build.xml index 0e04b2c0f0..c84456f80d 100644 --- a/build.xml +++ b/build.xml @@ -2640,8 +2640,8 @@ skip.installer property in build.properties" /> - - - + - 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: Ensure tests can continue to be run on Java 8
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 c14059f856 Ensure tests can continue to be run on Java 8
c14059f856 is described below
commit c14059f856217c85d41fd81f4ebac08aa21ac028
Author: Mark Thomas
AuthorDate: Mon Nov 6 13:06:02 2023 +
Ensure tests can continue to be run on Java 8
---
build.xml | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 4f218a03a9..7fedc36b03 100644
--- a/build.xml
+++ b/build.xml
@@ -2758,13 +2758,21 @@ asf.ldap.username=${release.asfusername}
-
+
+
+
+
+
+
+
+
+
@@ -3880,7 +3888,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
-
+
@@ -3955,7 +3963,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Call for Presentations now open: Community over Code EU 2024
Dear Sir/ MadamThank you very muchBest Regards Azhar On Monday, 30 October 2023 at 10:07:10 am GMT-7, Ryan Skraba wrote: (Note: You are receiving this because you are subscribed to the dev@ list for one or more projects of the Apache Software Foundation.) It's back *and* it's new! We're excited to announce that the first edition of Community over Code Europe (formerly known as ApacheCon EU) which will be held at the Radisson Blu Carlton Hotel in Bratislava, Slovakia from June 03-05, 2024! This eagerly anticipated event will be our first live EU conference since 2019. The Call for Presentations (CFP) for Community Over Code EU 2024 is now open at https://eu.communityovercode.org/blog/cfp-open/, and will close 2024/01/12 23:59:59 GMT. We welcome submissions on any topic related to the Apache Software Foundation, Apache projects, or the communities around those projects. We are specifically looking for presentations in the following categories: * API & Microservices * Big Data Compute * Big Data Storage * Cassandra * CloudStack * Community * Data Engineering * Fintech * Groovy * Incubator * IoT * Performance Engineering * Search * Tomcat, Httpd and other servers Additionally, we are thrilled to introduce a new feature this year: a poster session. This addition will provide an excellent platform for showcasing high-level projects and incubator initiatives in a visually engaging manner. We believe this will foster lively discussions and facilitate networking opportunities among participants. All my best, and thanks so much for your participation, Ryan Skraba (on behalf of the program committee) [Countdown]: https://www.timeanddate.com/countdown/to?iso=20240112T2359=1440 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Update BND to 7.0.0
On 2023/11/05 14:50:11 Mark Thomas wrote: > On 05/11/2023 10:10, Mark Thomas wrote: > > On 03/11/2023 15:07, Michael Osipov wrote: > >> On 2023/11/03 11:57:56 Mark Thomas wrote: > >>> On 03/11/2023 09:26, Michael Osipov wrote: > This change now completely missed to enfore Java 17 on < 11 and > opt-in to skip the required during tests I have introduced last month. > >>> > >>> Tomcat 11.0.x has required Java 21 to build for around 6 months. The BND > >>> requirement for Java 17 has no impact on the build. Did you mean to > >>> reference one of the older branches? > >> > >> Yes, as written < Tomcat 11. Tomcat 9 failed for me with a cryptic > >> "Java class version..." that is why I have introduced the ant target > >> to have a clear message. > > > > Ah. You replied to the commit message for 11.0.x and the meaning of < 11 > > was not clear. I thought it was somehow related to a Java version. > > > > It looks like < Tomcat 11 isn't correct anyway. I only see the option to > > skip the build version check in 9.0.x and 8.5.x. > > > > If we can skip the OSGi task (haven't tested this at all) if the > > skip.build.java.version is set then that should work. We should also add > > a fail the build with a useful error message if someone tries "ant > > release" with this property set. > > Hmm. You still have to build with Java 17 but it is possible to add a > few further hacks to build.xml so the tests will still run with Java 8. > > As the number of hacks increases, I become less convinced that it is > worth maintaining the ability to test with Java 8. I know that is the > minimum version but is the only reason to test on Java 8 that we don't > trust javac to honor the release target correctly? At this point, I see > no reason not to trust javac. It is not the the output of javac, but the runtime behavior of Java 8/11/17 might be different. If you cannot test with 8, but you claim to run on 8+ then it is a lie. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Update BND to 7.0.0
On 2023/11/05 10:10:20 Mark Thomas wrote: > On 03/11/2023 15:07, Michael Osipov wrote: > > On 2023/11/03 11:57:56 Mark Thomas wrote: > >> On 03/11/2023 09:26, Michael Osipov wrote: > >>> This change now completely missed to enfore Java 17 on < 11 and opt-in to > >>> skip the required during tests I have introduced last month. > >> > >> Tomcat 11.0.x has required Java 21 to build for around 6 months. The BND > >> requirement for Java 17 has no impact on the build. Did you mean to > >> reference one of the older branches? > > > > Yes, as written < Tomcat 11. Tomcat 9 failed for me with a cryptic "Java > > class version..." that is why I have introduced the ant target to have a > > clear message. > > Ah. You replied to the commit message for 11.0.x and the meaning of < 11 > was not clear. I thought it was somehow related to a Java version. That was a general remark. True, it does not apply to 11, but to Tomcat 10 and below. > It looks like < Tomcat 11 isn't correct anyway. I only see the option to > skip the build version check in 9.0.x and 8.5.x. > > If we can skip the OSGi task (haven't tested this at all) if the > skip.build.java.version is set then that should work. We should also add > a fail the build with a useful error message if someone tries "ant > release" with this property set. Yes, please. The build should be as expressive as possible telling why it failed since we know upfront that specific configs will fail. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67793] FORM authenticator does not remember original max inactive interval in all use-cases
https://bz.apache.org/bugzilla/show_bug.cgi?id=67793 --- Comment #5 from Channa --- Thank you for the fix. Would like to know, When Tomcat version 9.0.83 is available ? Thanks Channa -- 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
