[GUMP@gump-vm]: Project tomcat-tc9-test-apr (in module tomcat-tc9) success, but with warnings.
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc9-test-apr contains errors. The current state of this project is 'Success'. Full details are available at: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -ERROR- No such project [openssl-1-1-1-make-install] for property. -ERROR- Cannot resolve output/outputpath of *unknown* [openssl-1-1-1-make-install] -ERROR- Unhandled Property: test.openssl.path on: Ant on Project:tomcat-tc9-test-apr -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-tc9/output/test-tmp-APR/logs] The following work was performed: http://gump-vm.apache.org/tomcat-tc9/tomcat-tc9-test-apr/gump_work/build_tomcat-tc9_tomcat-tc9-test-apr.html Work Name: build_tomcat-tc9_tomcat-tc9-test-apr (Type: Build) Work ended in a state of : Success Elapsed: 49 mins 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-tc9/tomcat-build-libs -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar -Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.14-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-tc9/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.2-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/commons-daemon/target/commons-daemon-1.2.3-SNAPSHOT.jar -Dtest.openssl.path=*Unset* -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core -1.3.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dexecute.test.apr=true -Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.13-201909161045/ecj-4.13.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-1.2-1.1.1/dest-20200602/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.3-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-tc9] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-tc9/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-tc9/output/build/lib/servlet-api.jar:/srv/gump/
Re: [VOTE] Release Apache Tomcat 9.0.36
На ср, 3.06.2020 г. в 21:06 Mark Thomas написа: > > The proposed Apache Tomcat 9.0.36 release is now available for voting. > > The notable changes compared to the 9.0.35 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.36/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1270/ > The tag is: > https://github.com/apache/tomcat/tree/9.0.36 > 247c8e5ad08cdcd829a0bfc6374ecb3da0e5838e > > The proposed 9.0.36 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.36 +1 Regards, Violeta
Re: [VOTE] Release Apache Tomcat 8.5.56
На ср, 3.06.2020 г. в 23:51 Mark Thomas написа: > > The proposed Apache Tomcat 8.5.56 release is now available for voting. > > The notable changes compared to the 8.5.55 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.56/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1271/ > > The tag is: > https://github.com/apache/tomcat/tree/8.5.56 > 4560d2f5a49965f73ed07cb879f17d9c096c9d13 > > The proposed 8.5.56 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.56 +1 Regards, Violeta
buildbot success in on tomcat-9-trunk
The Buildbot has detected a restored build on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/271 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 1e649d5d794f4276541158d00c9a944e5ea0166e Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5224 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] efdc5cd01563983d627bc00af0196c7295289c2f Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Avoid IOOB
This is an automated email from the ASF dual-hosted git repository.
remm 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 4d7dde1 Avoid IOOB
4d7dde1 is described below
commit 4d7dde1d15fda7257a18c39b45cf095dd0a71810
Author: remm
AuthorDate: Fri Jun 5 00:34:04 2020 +0200
Avoid IOOB
---
java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index cf4d154..3b443c7 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -295,7 +295,9 @@ public class ResolverImpl extends Resolver {
elements.add(String.valueOf(alternateName.get(1)));
}
}
-return elements.get(n);
+if (elements.size() > n) {
+return elements.get(n);
+}
}
} catch (NumberFormatException | ArrayIndexOutOfBoundsException
| CertificateParsingException e) {
-
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: Avoid IOOB
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 1e649d5 Avoid IOOB
1e649d5 is described below
commit 1e649d5d794f4276541158d00c9a944e5ea0166e
Author: remm
AuthorDate: Fri Jun 5 00:34:04 2020 +0200
Avoid IOOB
---
java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index dfa0ebd..7b30227 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -306,7 +306,9 @@ public class ResolverImpl extends Resolver {
elements.add(String.valueOf(alternateName.get(1)));
}
}
-return elements.get(n);
+if (elements.size() > n) {
+return elements.get(n);
+}
}
} catch (NumberFormatException | ArrayIndexOutOfBoundsException
| CertificateParsingException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Avoid IOOB
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new efdc5cd Avoid IOOB
efdc5cd is described below
commit efdc5cd01563983d627bc00af0196c7295289c2f
Author: remm
AuthorDate: Fri Jun 5 00:34:04 2020 +0200
Avoid IOOB
---
java/org/apache/catalina/valves/rewrite/ResolverImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index dfa0ebd..7b30227 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -306,7 +306,9 @@ public class ResolverImpl extends Resolver {
elements.add(String.valueOf(alternateName.get(1)));
}
}
-return elements.get(n);
+if (elements.size() > n) {
+return elements.get(n);
+}
}
} catch (NumberFormatException | ArrayIndexOutOfBoundsException
| CertificateParsingException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/5223 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 43aa504fb292618d63767839dda9f57f19d3b3a7 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/270 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' triggered this build Build Source Stamp: [branch 9.0.x] 55443d317da37d6c6bc1ee1f81078e1d9dea91c7 Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Implement more of the TLS env in rewrite resolver
This is an automated email from the ASF dual-hosted git repository.
remm 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 105eb94 Implement more of the TLS env in rewrite resolver
105eb94 is described below
commit 105eb948dcd88cfe1cad89694fa077f603d57a9d
Author: remm
AuthorDate: Thu Jun 4 23:13:36 2020 +0200
Implement more of the TLS env in rewrite resolver
---
.../catalina/valves/rewrite/ResolverImpl.java | 75 ++
.../catalina/valves/rewrite/TestResolverSSL.java | 20 +++---
2 files changed, 73 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 1211d4b..cf4d154 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -19,9 +19,15 @@ package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;
import org.apache.catalina.WebResource;
@@ -145,18 +151,22 @@ public class ResolverImpl extends Resolver {
public String resolveSsl(String key) {
SSLSupport sslSupport = (SSLSupport)
request.getAttribute(SSLSupport.SESSION_MGR);
try {
-// FIXME SSL_SESSION_RESUMED in SSLHostConfig
-// FIXME SSL_SECURE_RENEG in SSLHostConfig
-// FIXME SSL_COMPRESS_METHOD in SSLHostConfig
-// FIXME SSL_TLS_SNI from handshake
-// FIXME SSL_SRP_USER
-// FIXME SSL_SRP_USERINFO
+// SSL_SRP_USER: no planned support for SRP
+// SSL_SRP_USERINFO: no planned support for SRP
if (key.equals("HTTPS")) {
return String.valueOf(sslSupport != null);
} else if (key.equals("SSL_PROTOCOL")) {
return sslSupport.getProtocol();
} else if (key.equals("SSL_SESSION_ID")) {
return sslSupport.getSessionId();
+} else if (key.equals("SSL_SESSION_RESUMED")) {
+// FIXME session resumption state, not available anywhere
+} else if (key.equals("SSL_SECURE_RENEG")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_COMPRESS_METHOD")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_TLS_SNI")) {
+// FIXME from handshake SNI processing
} else if (key.equals("SSL_CIPHER")) {
return sslSupport.getCipherSuite();
} else if (key.equals("SSL_CIPHER_EXPORT")) {
@@ -188,12 +198,13 @@ public class ResolverImpl extends Resolver {
if (result != null) {
return result;
} else if (key.startsWith("SAN_OTHER_msUPN_")) {
+// Type otherName, which is 0
key = key.substring("SAN_OTHER_msUPN_".length());
-// FIXME return
certificates[0].getSubjectAlternativeNames()
+// FIXME OID from resolveAlternateName
} else if (key.equals("CERT_RFC4523_CEA")) {
-// FIXME return certificates[0]
+// FIXME return certificate[0] format
CertificateExactAssertion in RFC4523
} else if (key.equals("VERIFY")) {
-// FIXME return verification state
+// FIXME return verification state, not available
anywhere
}
}
} else if (key.startsWith("SSL_SERVER_")) {
@@ -214,18 +225,20 @@ public class ResolverImpl extends Resolver {
return certificates[0].getSubjectDN().getName();
} else if (key.startsWith("S_DN_")) {
key = key.substring("S_DN_".length());
-// FIXME would need access to X500Name from X500Principal
+return
resolveComponent(certificates[0].getSubjectX500Principal().getName(), key);
} else if (key.startsWith("SAN_Email_")) {
+// Type rfc822Name, which is 1
key = key.substring("SAN_Email_".length());
-// FIXME return certificates[0].getSubjectAlternativeNames()
+return resolveAlternateName(certificates[0], 1,
Integer.parseInt(key));
} else if (key.startsWith("SAN_DNS_")) {
+// Type dNSName, which is 2
key =
[tomcat] branch 9.0.x updated: Implement more of the TLS env in rewrite resolver
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 55443d3 Implement more of the TLS env in rewrite resolver
55443d3 is described below
commit 55443d317da37d6c6bc1ee1f81078e1d9dea91c7
Author: remm
AuthorDate: Thu Jun 4 23:13:36 2020 +0200
Implement more of the TLS env in rewrite resolver
---
.../catalina/valves/rewrite/ResolverImpl.java | 78 +-
.../catalina/valves/rewrite/TestResolverSSL.java | 20 +++---
2 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 51566f0..dfa0ebd 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -19,9 +19,15 @@ package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;
import org.apache.catalina.WebResource;
@@ -145,18 +151,22 @@ public class ResolverImpl extends Resolver {
public String resolveSsl(String key) {
SSLSupport sslSupport = (SSLSupport)
request.getAttribute(SSLSupport.SESSION_MGR);
try {
-// FIXME SSL_SESSION_RESUMED in SSLHostConfig
-// FIXME SSL_SECURE_RENEG in SSLHostConfig
-// FIXME SSL_COMPRESS_METHOD in SSLHostConfig
-// FIXME SSL_TLS_SNI from handshake
-// FIXME SSL_SRP_USER
-// FIXME SSL_SRP_USERINFO
+// SSL_SRP_USER: no planned support for SRP
+// SSL_SRP_USERINFO: no planned support for SRP
if (key.equals("HTTPS")) {
return String.valueOf(sslSupport != null);
} else if (key.equals("SSL_PROTOCOL")) {
return sslSupport.getProtocol();
} else if (key.equals("SSL_SESSION_ID")) {
return sslSupport.getSessionId();
+} else if (key.equals("SSL_SESSION_RESUMED")) {
+// FIXME session resumption state, not available anywhere
+} else if (key.equals("SSL_SECURE_RENEG")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_COMPRESS_METHOD")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_TLS_SNI")) {
+// FIXME from handshake SNI processing
} else if (key.equals("SSL_CIPHER")) {
return sslSupport.getCipherSuite();
} else if (key.equals("SSL_CIPHER_EXPORT")) {
@@ -188,12 +198,13 @@ public class ResolverImpl extends Resolver {
if (result != null) {
return result;
} else if (key.startsWith("SAN_OTHER_msUPN_")) {
+// Type otherName, which is 0
key = key.substring("SAN_OTHER_msUPN_".length());
-// FIXME return
certificates[0].getSubjectAlternativeNames()
+// FIXME OID from resolveAlternateName
} else if (key.equals("CERT_RFC4523_CEA")) {
-// FIXME return certificates[0]
+// FIXME return certificate[0] format
CertificateExactAssertion in RFC4523
} else if (key.equals("VERIFY")) {
-// FIXME return verification state
+// FIXME return verification state, not available
anywhere
}
}
} else if (key.startsWith("SSL_SERVER_")) {
@@ -204,8 +215,9 @@ public class ResolverImpl extends Resolver {
if (result != null) {
return result;
} else if (key.startsWith("SAN_OTHER_dnsSRV_")) {
+// Type otherName, which is 0
key = key.substring("SAN_OTHER_dnsSRV_".length());
-// FIXME return
certificates[0].getSubjectAlternativeNames()
+// FIXME OID from resolveAlternateName
}
}
}
@@ -224,18 +236,20 @@ public class ResolverImpl extends Resolver {
return certificates[0].getSubjectDN().getName();
} else if (key.startsWith("S_DN_")) {
key = key.substring("S_DN_".length());
-// FIXME would need access to X500Name from
[tomcat] branch master updated: Implement more of the TLS env in rewrite resolver
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 43aa504 Implement more of the TLS env in rewrite resolver
43aa504 is described below
commit 43aa504fb292618d63767839dda9f57f19d3b3a7
Author: remm
AuthorDate: Thu Jun 4 23:13:36 2020 +0200
Implement more of the TLS env in rewrite resolver
---
.../catalina/valves/rewrite/ResolverImpl.java | 78 +-
.../catalina/valves/rewrite/TestResolverSSL.java | 20 +++---
2 files changed, 75 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
index 51566f0..dfa0ebd 100644
--- a/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
+++ b/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
@@ -19,9 +19,15 @@ package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;
import org.apache.catalina.WebResource;
@@ -145,18 +151,22 @@ public class ResolverImpl extends Resolver {
public String resolveSsl(String key) {
SSLSupport sslSupport = (SSLSupport)
request.getAttribute(SSLSupport.SESSION_MGR);
try {
-// FIXME SSL_SESSION_RESUMED in SSLHostConfig
-// FIXME SSL_SECURE_RENEG in SSLHostConfig
-// FIXME SSL_COMPRESS_METHOD in SSLHostConfig
-// FIXME SSL_TLS_SNI from handshake
-// FIXME SSL_SRP_USER
-// FIXME SSL_SRP_USERINFO
+// SSL_SRP_USER: no planned support for SRP
+// SSL_SRP_USERINFO: no planned support for SRP
if (key.equals("HTTPS")) {
return String.valueOf(sslSupport != null);
} else if (key.equals("SSL_PROTOCOL")) {
return sslSupport.getProtocol();
} else if (key.equals("SSL_SESSION_ID")) {
return sslSupport.getSessionId();
+} else if (key.equals("SSL_SESSION_RESUMED")) {
+// FIXME session resumption state, not available anywhere
+} else if (key.equals("SSL_SECURE_RENEG")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_COMPRESS_METHOD")) {
+// FIXME available from SSLHostConfig
+} else if (key.equals("SSL_TLS_SNI")) {
+// FIXME from handshake SNI processing
} else if (key.equals("SSL_CIPHER")) {
return sslSupport.getCipherSuite();
} else if (key.equals("SSL_CIPHER_EXPORT")) {
@@ -188,12 +198,13 @@ public class ResolverImpl extends Resolver {
if (result != null) {
return result;
} else if (key.startsWith("SAN_OTHER_msUPN_")) {
+// Type otherName, which is 0
key = key.substring("SAN_OTHER_msUPN_".length());
-// FIXME return
certificates[0].getSubjectAlternativeNames()
+// FIXME OID from resolveAlternateName
} else if (key.equals("CERT_RFC4523_CEA")) {
-// FIXME return certificates[0]
+// FIXME return certificate[0] format
CertificateExactAssertion in RFC4523
} else if (key.equals("VERIFY")) {
-// FIXME return verification state
+// FIXME return verification state, not available
anywhere
}
}
} else if (key.startsWith("SSL_SERVER_")) {
@@ -204,8 +215,9 @@ public class ResolverImpl extends Resolver {
if (result != null) {
return result;
} else if (key.startsWith("SAN_OTHER_dnsSRV_")) {
+// Type otherName, which is 0
key = key.substring("SAN_OTHER_dnsSRV_".length());
-// FIXME return
certificates[0].getSubjectAlternativeNames()
+// FIXME OID from resolveAlternateName
}
}
}
@@ -224,18 +236,20 @@ public class ResolverImpl extends Resolver {
return certificates[0].getSubjectDN().getName();
} else if (key.startsWith("S_DN_")) {
key = key.substring("S_DN_".length());
-// FIXME would need access to X500Name from
Re: [VOTE] Release Apache Tomcat migration tool for Jakarta EE 0.0.2
On Thu, Jun 4, 2020 at 3:08 PM Emmanuel Bourg wrote: > I'd like to call for a vote to release the version 0.0.2 of the > Jakarta EE migration tool. > > This will be a "tag only" release with no distribution of the binaries > (neither from Apache nor from Maven Central). > > The notable changes compared to 0.0.1 are: > > - An Ant task has been added > > - Inplace file migration is now supported > > - EC signatures are now removed from the migrated jar files > > - Better log formatting when running from the command line > > - New '-verbose' option for the command line > > > Tag: > > https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git;a=commit;h=45d354c1835a1583baf0be02ae77e70fd290f2da > > Source: > https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git > > > The proposed 0.0.2 release is: > [ ] Broken - do not release > [X] Beta - go ahead and release as 0.0.2 > > Rémy
[tomcat] branch master updated: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new de6beb2 Remove unused code
de6beb2 is described below
commit de6beb225fa44c34f4aa6ff6affa23fd70084bfa
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:33:04 2020 +0100
Remove unused code
---
java/org/apache/catalina/startup/Catalina.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index e30ccc2..4761571 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -571,8 +571,6 @@ public class Catalina {
long t1 = System.nanoTime();
-initDirs();
-
// Before digester - it may be needed
initNaming();
@@ -758,14 +756,6 @@ public class Catalina {
}
-/**
- * @deprecated unused. Will be removed in Tomcat 10 onwards.
- */
-@Deprecated
-protected void initDirs() {
-}
-
-
protected void initStreams() {
// Replace System.out and System.err with a custom PrintStream
System.setOut(new SystemLogHandler(System.out));
-
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: Play a little more nicely with read-only file systems
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 ccf0a9b Play a little more nicely with read-only file systems
ccf0a9b is described below
commit ccf0a9b246427014f59aaf904ad5441b343e2976
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5df6701..dbfcc1b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -792,11 +792,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index ff890a5..a56ee23 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -674,7 +674,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -695,14 +695,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 5daf876..0197b39 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -57,6 +57,7 @@ contextConfig.jndiUrlNotDirContextConn=The connection created
for URL [{0}] was
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -74,8 +75,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch master updated: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new de6beb2 Remove unused code
de6beb2 is described below
commit de6beb225fa44c34f4aa6ff6affa23fd70084bfa
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:33:04 2020 +0100
Remove unused code
---
java/org/apache/catalina/startup/Catalina.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index e30ccc2..4761571 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -571,8 +571,6 @@ public class Catalina {
long t1 = System.nanoTime();
-initDirs();
-
// Before digester - it may be needed
initNaming();
@@ -758,14 +756,6 @@ public class Catalina {
}
-/**
- * @deprecated unused. Will be removed in Tomcat 10 onwards.
- */
-@Deprecated
-protected void initDirs() {
-}
-
-
protected void initStreams() {
// Replace System.out and System.err with a custom PrintStream
System.setOut(new SystemLogHandler(System.out));
-
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: Play a little more nicely with read-only file systems
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 ccf0a9b Play a little more nicely with read-only file systems
ccf0a9b is described below
commit ccf0a9b246427014f59aaf904ad5441b343e2976
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5df6701..dbfcc1b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -792,11 +792,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index ff890a5..a56ee23 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -674,7 +674,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -695,14 +695,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 5daf876..0197b39 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -57,6 +57,7 @@ contextConfig.jndiUrlNotDirContextConn=The connection created
for URL [{0}] was
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -74,8 +75,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch master updated: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new de6beb2 Remove unused code
de6beb2 is described below
commit de6beb225fa44c34f4aa6ff6affa23fd70084bfa
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:33:04 2020 +0100
Remove unused code
---
java/org/apache/catalina/startup/Catalina.java | 10 --
1 file changed, 10 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index e30ccc2..4761571 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -571,8 +571,6 @@ public class Catalina {
long t1 = System.nanoTime();
-initDirs();
-
// Before digester - it may be needed
initNaming();
@@ -758,14 +756,6 @@ public class Catalina {
}
-/**
- * @deprecated unused. Will be removed in Tomcat 10 onwards.
- */
-@Deprecated
-protected void initDirs() {
-}
-
-
protected void initStreams() {
// Replace System.out and System.err with a custom PrintStream
System.setOut(new SystemLogHandler(System.out));
-
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: Play a little more nicely with read-only file systems
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 ccf0a9b Play a little more nicely with read-only file systems
ccf0a9b is described below
commit ccf0a9b246427014f59aaf904ad5441b343e2976
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5df6701..dbfcc1b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -792,11 +792,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index ff890a5..a56ee23 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -674,7 +674,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -695,14 +695,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 5daf876..0197b39 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -57,6 +57,7 @@ contextConfig.jndiUrlNotDirContextConn=The connection created
for URL [{0}] was
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -74,8 +75,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch 8.5.x updated: Play a little more nicely with read-only file systems
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 ccf0a9b Play a little more nicely with read-only file systems
ccf0a9b is described below
commit ccf0a9b246427014f59aaf904ad5441b343e2976
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5df6701..dbfcc1b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -792,11 +792,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index ff890a5..a56ee23 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -674,7 +674,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -695,14 +695,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 5daf876..0197b39 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -57,6 +57,7 @@ contextConfig.jndiUrlNotDirContextConn=The connection created
for URL [{0}] was
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -74,8 +75,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch 8.5.x updated: Play a little more nicely with read-only file systems
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 ccf0a9b Play a little more nicely with read-only file systems
ccf0a9b is described below
commit ccf0a9b246427014f59aaf904ad5441b343e2976
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 5df6701..dbfcc1b 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -792,11 +792,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index ff890a5..a56ee23 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -674,7 +674,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -695,14 +695,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 5daf876..0197b39 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -57,6 +57,7 @@ contextConfig.jndiUrlNotDirContextConn=The connection created
for URL [{0}] was
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -74,8 +75,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch 9.0.x updated: Play a little more nicely with read-only file systems
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 194bc7e Play a little more nicely with read-only file systems
194bc7e is described below
commit 194bc7e174133034b557e934abee8ddbf11d82d6
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
s
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 72fac48..00c820e 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -733,11 +733,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index 4b2663e..2c09a15 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -672,7 +672,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -693,14 +693,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index c857b48..1c897e7 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -66,6 +66,7 @@ contextConfig.jarFile=Unable to process Jar [{0}] for
annotations
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -84,8 +85,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
[tomcat] branch master updated: Fix typo.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new b6d1a0c Fix typo. b6d1a0c is described below commit b6d1a0cc7193cd99cec5bbe6a0af057c569884ab Author: Mark Thomas AuthorDate: Thu Jun 4 21:25:08 2020 +0100 Fix typo. --- 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 bd7cc20..0778232 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -48,10 +48,10 @@ -Remove the error message on start if java.io.tmp is missing -and add an explicit error message on application deployment when the -sole feature that depends on it (anti-resource locking) is configured -and can't be used. (markt) +Remove the error message on start if java.io.tmpdir is +missing and add an explicit error message on application deployment when +the sole feature that depends on it (anti-resource locking) is +configured and can't be used. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Play a little more nicely with read-only file systems
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f450849 Play a little more nicely with read-only file systems
f450849 is described below
commit f450849e3de8877fbccc49a6fc85c6bb83118160
Author: Mark Thomas
AuthorDate: Thu Jun 4 21:23:07 2020 +0100
Play a little more nicely with read-only file systems
---
java/org/apache/catalina/startup/Catalina.java | 8
java/org/apache/catalina/startup/ContextConfig.java | 17 ++---
.../org/apache/catalina/startup/LocalStrings.properties | 3 +--
.../apache/catalina/startup/LocalStrings_es.properties | 2 --
.../apache/catalina/startup/LocalStrings_fr.properties | 2 --
.../apache/catalina/startup/LocalStrings_ja.properties | 2 --
.../apache/catalina/startup/LocalStrings_ko.properties | 2 --
.../catalina/startup/LocalStrings_zh_CN.properties | 2 --
webapps/docs/changelog.xml | 10 ++
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 340641c..e30ccc2 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -758,11 +758,11 @@ public class Catalina {
}
+/**
+ * @deprecated unused. Will be removed in Tomcat 10 onwards.
+ */
+@Deprecated
protected void initDirs() {
-String temp = System.getProperty("java.io.tmpdir");
-if (temp == null || (!(new File(temp)).isDirectory())) {
-log.error(sm.getString("embedded.notmp", temp));
-}
}
diff --git a/java/org/apache/catalina/startup/ContextConfig.java
b/java/org/apache/catalina/startup/ContextConfig.java
index 14eb4e6..09eb1fd 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -672,7 +672,7 @@ public class ContextConfig implements LifecycleListener {
protected void antiLocking() {
if ((context instanceof StandardContext)
-&& ((StandardContext) context).getAntiResourceLocking()) {
+&& ((StandardContext) context).getAntiResourceLocking()) {
Host host = (Host) context.getParent();
String docBase = context.getDocBase();
@@ -693,14 +693,17 @@ public class ContextConfig implements LifecycleListener {
ContextName cn = new ContextName(path, context.getWebappVersion());
docBase = cn.getBaseName();
+String tmp = System.getProperty("java.io.tmpdir");
+File tmpFile = new File(tmp);
+if (!tmpFile.isDirectory()) {
+log.error(sm.getString("contextConfig.noAntiLocking", tmp,
context.getName()));
+return;
+}
+
if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase + ".war");
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase + ".war");
} else {
-antiLockingDocBase = new File(
-System.getProperty("java.io.tmpdir"),
-deploymentCount++ + "-" + docBase);
+antiLockingDocBase = new File(tmpFile, deploymentCount++ + "-"
+ docBase);
}
antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index c857b48..1c897e7 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -66,6 +66,7 @@ contextConfig.jarFile=Unable to process Jar [{0}] for
annotations
contextConfig.jspFile.error=JSP file [{0}] must start with a ''/''
contextConfig.jspFile.warning=WARNING: JSP file [{0}] must start with a ''/''
in Servlet 2.4
contextConfig.missingRealm=No Realm has been configured to authenticate against
+contextConfig.noAntiLocking=The value [{0}] configured for java.io.tmpdir does
not point to a valid directory. The antiResourceLocking setting for the web
application [{1}] will be ignored.
contextConfig.processAnnotationsDir.debug=Scanning directory for class files
with annotations [{0}]
contextConfig.processAnnotationsJar.debug=Scanning jar file for class files
with annotations [{0}]
contextConfig.processAnnotationsWebDir.debug=Scanning web application
directory for class files with annotations [{0}]
@@ -84,8 +85,6 @@ contextConfig.unknownUrlProtocol=The URL protocol [{0}] was
not recognised durin
Re: [VOTE] Release Apache Tomcat 9.0.36
On Wed, Jun 3, 2020 at 2:06 PM Mark Thomas wrote: > The proposed Apache Tomcat 9.0.36 release is now available for voting. > > The notable changes compared to the 9.0.35 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.36/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1270/ > The tag is: > https://github.com/apache/tomcat/tree/9.0.36 > 247c8e5ad08cdcd829a0bfc6374ecb3da0e5838e > > The proposed 9.0.36 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 9.0.36 > +1 > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: Usage of SynchronizedStack/Queue
On Thu, Jun 4, 2020 at 6:16 PM Mark Thomas wrote: > On 04/06/2020 16:33, Martin Grigorov wrote: > > Hi team, > > > > I am profiling our application and I've found that Tomcat uses its own > > Synchronized Queue/Stack implementations which synchronize on instance > > level, i.e. their methods are 'synchronized'. > Can you work off 10 (master) first ? > > ~8 years ago when I was profiling Tomcat and wrote those having > something targetted to Tomcat's specific use case made a measurable > improvement. > Yes, the SyncStack was the go to structure for all reuse. Not sure if it's the best. I already removed some of the usage in 10: - No more block poller and its pooling/recycling [I had to pull its removal out of 9 due to an unfortunate regression, this could be brought back now that it seems to work] - No recycling of trivial objects The main use should now be the recycled processors and the recycled channels (it would be bad to not reuse them since they may use direct buffers ...). > > I am more than prepared to believe that things have moved on since then > but I'd be interested in seeing the same numbers with the latest Java 8 > from Adopt OpenJDK rather than Java 14. > +1, firnally there could be some differences between JDK, like now they started to actually improve NIO 1 again. Rémy > > I'd also like to see overall throughput numbers and the GC frequency for > each test scenario. > > Mark > > > > > > > The javadoc for those two classes say that they are preferred because > > they are GC-friendlier than > > java.uti.concurrent.ConcurrentLinkedQueue. > > > > I use Async Profiler > > (https://github.com/jvm-profiling-tools/async-profiler) to profile CPU, > > memory, > > locks and few lower level types (from perf). > > Issuing "./profiler.sh -e lock -d 60 PID" against 9.0.x shows such > reports: > > > > Started [lock] profiling > > > > --- Execution profile --- > > > > Total samples : 713834 > > > > > > > > Frame buffer usage : 0.0288% > > > > > > --- > > 1106165618177 ns (58.97%), 395609 samples > > > > [ 0] > > org.apache.tomcat.util.collections.SynchronizedStack > > > > [ 1] > > org.apache.tomcat.util.collections.SynchronizedStack.push > > > > [ 2] > > org.apache.tomcat.util.net.NioBlockingSelector.write > > > > [ 3] > > org.apache.tomcat.util.net.NioSelectorPool.write > > > > [ 4] > > org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite > > > > [ 5] > > org.apache.tomcat.util.net.SocketWrapperBase.doWrite > > > > [ 6] > > org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking > > > > [ 7] > > org.apache.tomcat.util.net.SocketWrapperBase.flush > > > > [ 8] > > org.apache.coyote.http11.Http11OutputBuffer$SocketOutputBuffer.end > > [ 9] org.apache.coyote.http11.filters.IdentityOutputFilter.end > > > > [10] org.apache.coyote.http11.Http11OutputBuffer.end > > [11] org.apache.coyote.http11.Http11Processor.finishResponse > > [12] org.apache.coyote.AbstractProcessor.action > > [13] org.apache.coyote.Response.action > > [14] org.apache.catalina.connector.OutputBuffer.close > > [15] org.apache.catalina.connector.Response.finishResponse > > [16] org.apache.catalina.connector.CoyoteAdapter.service > > [17] org.apache.coyote.http11.Http11Processor.service > > [18] org.apache.coyote.AbstractProcessorLight.process > > [19] org.apache.coyote.AbstractProtocol$ConnectionHandler.process > > [20] org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun > > [21] org.apache.tomcat.util.net.SocketProcessorBase.run > > [22] java.util.concurrent.ThreadPoolExecutor.runWorker > > [23] java.util.concurrent.ThreadPoolExecutor$Worker.run > > [24] org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run > > [25] java.lang.Thread.run > > > > --- 769519847169 ns (41.03%), 314384 samples > > [ 0] org.apache.tomcat.util.collections.SynchronizedStack > > [ 1] org.apache.tomcat.util.collections.SynchronizedStack.pop > > [ 2] org.apache.tomcat.util.net.NioBlockingSelector.write > > [ 3] org.apache.tomcat.util.net.NioSelectorPool.write > > [ 4] org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite > > [ 5] org.apache.tomcat.util.net.SocketWrapperBase.doWrite > > [ 6] org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking > > [ 7] org.apache.tomcat.util.net.SocketWrapperBase.flush > > [ 8]
[tomcat] branch 7.0.x updated: Remove unnecessary code. This attribute will always be set.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 33c750a Remove unnecessary code. This attribute will always be set.
33c750a is described below
commit 33c750a5b97ead5c68efec53565896ed50534d3a
Author: Mark Thomas
AuthorDate: Thu Jun 4 17:47:23 2020 +0100
Remove unnecessary code. This attribute will always be set.
---
java/org/apache/jasper/EmbeddedServletOptions.java | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 49e798c..c4ac5a2 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -657,17 +657,9 @@ public final class EmbeddedServletOptions implements
Options {
if (dir != null) {
scratchDir = new File(dir);
} else {
-// First try the Servlet 2.2 javax.servlet.context.tempdir property
scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
-if (scratchDir == null) {
-// Not running in a Servlet 2.2 container.
-// Try to get the JDK 1.2 java.io.tmpdir property
-dir = System.getProperty("java.io.tmpdir");
-if (dir != null)
-scratchDir = new File(dir);
-}
}
-if (this.scratchDir == null) {
+if (scratchDir == null) {
log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
return;
}
-
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: Remove unnecessary code. This attribute will always be set.
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 6d7e1a0 Remove unnecessary code. This attribute will always be set.
6d7e1a0 is described below
commit 6d7e1a00cd706654eca445989d85960cbfba83ac
Author: Mark Thomas
AuthorDate: Thu Jun 4 17:47:23 2020 +0100
Remove unnecessary code. This attribute will always be set.
---
java/org/apache/jasper/EmbeddedServletOptions.java | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 4ddce3c..19d9bba 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -670,17 +670,9 @@ public final class EmbeddedServletOptions implements
Options {
if (dir != null) {
scratchDir = new File(dir);
} else {
-// First try the Servlet 2.2 javax.servlet.context.tempdir property
scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
-if (scratchDir == null) {
-// Not running in a Servlet 2.2 container.
-// Try to get the JDK 1.2 java.io.tmpdir property
-dir = System.getProperty("java.io.tmpdir");
-if (dir != null)
-scratchDir = new File(dir);
-}
}
-if (this.scratchDir == null) {
+if (scratchDir == null) {
log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
return;
}
-
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: Remove unnecessary code. This attribute will always be set.
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 f7ce847 Remove unnecessary code. This attribute will always be set.
f7ce847 is described below
commit f7ce8472149a92f1a2abdb49bddf64640d1a9295
Author: Mark Thomas
AuthorDate: Thu Jun 4 17:47:23 2020 +0100
Remove unnecessary code. This attribute will always be set.
---
java/org/apache/jasper/EmbeddedServletOptions.java | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 3129cdb..3636f62 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -662,17 +662,9 @@ public final class EmbeddedServletOptions implements
Options {
if (dir != null) {
scratchDir = new File(dir);
} else {
-// First try the Servlet 2.2 javax.servlet.context.tempdir property
scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
-if (scratchDir == null) {
-// Not running in a Servlet 2.2 container.
-// Try to get the JDK 1.2 java.io.tmpdir property
-dir = System.getProperty("java.io.tmpdir");
-if (dir != null)
-scratchDir = new File(dir);
-}
}
-if (this.scratchDir == null) {
+if (scratchDir == null) {
log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove unnecessary code. This attribute will always be set.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 133fc41 Remove unnecessary code. This attribute will always be set.
133fc41 is described below
commit 133fc41b770de02fb0ea75367815ac17d7bc9a84
Author: Mark Thomas
AuthorDate: Thu Jun 4 17:47:23 2020 +0100
Remove unnecessary code. This attribute will always be set.
---
java/org/apache/jasper/EmbeddedServletOptions.java | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index e0198c6..1758a8d 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -753,17 +753,9 @@ public final class EmbeddedServletOptions implements
Options {
if (dir != null) {
scratchDir = new File(dir);
} else {
-// First try the Servlet 2.2 jakarta.servlet.context.tempdir
property
scratchDir = (File) context.getAttribute(ServletContext.TEMPDIR);
-if (scratchDir == null) {
-// Not running in a Servlet 2.2 container.
-// Try to get the JDK 1.2 java.io.tmpdir property
-dir = System.getProperty("java.io.tmpdir");
-if (dir != null)
-scratchDir = new File(dir);
-}
}
-if (this.scratchDir == null) {
+if (scratchDir == null) {
log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2337 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 8ca1377197245e1352e4d011cdd0404ba5672551 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Usage of SynchronizedStack/Queue
On 04/06/2020 16:33, Martin Grigorov wrote: > Hi team, > > I am profiling our application and I've found that Tomcat uses its own > Synchronized Queue/Stack implementations which synchronize on instance > level, i.e. their methods are 'synchronized'. ~8 years ago when I was profiling Tomcat and wrote those having something targetted to Tomcat's specific use case made a measurable improvement. I am more than prepared to believe that things have moved on since then but I'd be interested in seeing the same numbers with the latest Java 8 from Adopt OpenJDK rather than Java 14. I'd also like to see overall throughput numbers and the GC frequency for each test scenario. Mark > > The javadoc for those two classes say that they are preferred because > they are GC-friendlier than > java.uti.concurrent.ConcurrentLinkedQueue. > > I use Async Profiler > (https://github.com/jvm-profiling-tools/async-profiler) to profile CPU, > memory, > locks and few lower level types (from perf). > Issuing "./profiler.sh -e lock -d 60 PID" against 9.0.x shows such reports: > > Started [lock] profiling > > --- Execution profile --- > > Total samples : 713834 > > > > Frame buffer usage : 0.0288% > > > --- > 1106165618177 ns (58.97%), 395609 samples > > [ 0] > org.apache.tomcat.util.collections.SynchronizedStack > > [ 1] > org.apache.tomcat.util.collections.SynchronizedStack.push > > [ 2] > org.apache.tomcat.util.net.NioBlockingSelector.write > > [ 3] > org.apache.tomcat.util.net.NioSelectorPool.write > > [ 4] > org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite > > [ 5] > org.apache.tomcat.util.net.SocketWrapperBase.doWrite > > [ 6] > org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking > > [ 7] > org.apache.tomcat.util.net.SocketWrapperBase.flush > > [ 8] > org.apache.coyote.http11.Http11OutputBuffer$SocketOutputBuffer.end > [ 9] org.apache.coyote.http11.filters.IdentityOutputFilter.end > > [10] org.apache.coyote.http11.Http11OutputBuffer.end > [11] org.apache.coyote.http11.Http11Processor.finishResponse > [12] org.apache.coyote.AbstractProcessor.action > [13] org.apache.coyote.Response.action > [14] org.apache.catalina.connector.OutputBuffer.close > [15] org.apache.catalina.connector.Response.finishResponse > [16] org.apache.catalina.connector.CoyoteAdapter.service > [17] org.apache.coyote.http11.Http11Processor.service > [18] org.apache.coyote.AbstractProcessorLight.process > [19] org.apache.coyote.AbstractProtocol$ConnectionHandler.process > [20] org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun > [21] org.apache.tomcat.util.net.SocketProcessorBase.run > [22] java.util.concurrent.ThreadPoolExecutor.runWorker > [23] java.util.concurrent.ThreadPoolExecutor$Worker.run > [24]
Usage of SynchronizedStack/Queue
Hi team, I am profiling our application and I've found that Tomcat uses its own Synchronized Queue/Stack implementations which synchronize on instance level, i.e. their methods are 'synchronized'. The javadoc for those two classes say that they are preferred because they are GC-friendlier than java.uti.concurrent.ConcurrentLinkedQueue. I use Async Profiler (https://github.com/jvm-profiling-tools/async-profiler) to profile CPU, memory, locks and few lower level types (from perf). Issuing "./profiler.sh -e lock -d 60 PID" against 9.0.x shows such reports: Started [lock] profiling --- Execution profile --- Total samples : 713834 Frame buffer usage : 0.0288% --- 1106165618177 ns (58.97%), 395609 samples [ 0] org.apache.tomcat.util.collections.SynchronizedStack [ 1] org.apache.tomcat.util.collections.SynchronizedStack.push [ 2] org.apache.tomcat.util.net.NioBlockingSelector.write [ 3] org.apache.tomcat.util.net.NioSelectorPool.write [ 4] org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite [ 5] org.apache.tomcat.util.net.SocketWrapperBase.doWrite [ 6] org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking [ 7] org.apache.tomcat.util.net.SocketWrapperBase.flush [ 8] org.apache.coyote.http11.Http11OutputBuffer$SocketOutputBuffer.end [ 9] org.apache.coyote.http11.filters.IdentityOutputFilter.end [10] org.apache.coyote.http11.Http11OutputBuffer.end [11] org.apache.coyote.http11.Http11Processor.finishResponse [12] org.apache.coyote.AbstractProcessor.action [13] org.apache.coyote.Response.action [14] org.apache.catalina.connector.OutputBuffer.close [15] org.apache.catalina.connector.Response.finishResponse [16] org.apache.catalina.connector.CoyoteAdapter.service [17] org.apache.coyote.http11.Http11Processor.service [18] org.apache.coyote.AbstractProcessorLight.process [19] org.apache.coyote.AbstractProtocol$ConnectionHandler.process [20] org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun [21] org.apache.tomcat.util.net.SocketProcessorBase.run [22] java.util.concurrent.ThreadPoolExecutor.runWorker [23] java.util.concurrent.ThreadPoolExecutor$Worker.run [24] org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run [25] java.lang.Thread.run --- 769519847169 ns (41.03%), 314384 samples [ 0] org.apache.tomcat.util.collections.SynchronizedStack [ 1] org.apache.tomcat.util.collections.SynchronizedStack.pop [ 2] org.apache.tomcat.util.net.NioBlockingSelector.write [ 3] org.apache.tomcat.util.net.NioSelectorPool.write [ 4] org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite [ 5] org.apache.tomcat.util.net.SocketWrapperBase.doWrite [ 6] org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking [ 7] org.apache.tomcat.util.net.SocketWrapperBase.flush [ 8] org.apache.coyote.http11.Http11OutputBuffer$SocketOutputBuffer.end [ 9] org.apache.coyote.http11.filters.IdentityOutputFilter.end [10] org.apache.coyote.http11.Http11OutputBuffer.end [11] org.apache.coyote.http11.Http11Processor.finishResponse I've made the following changes - https://github.com/apache/tomcat/compare/9.0.x...martin-g:feature/lock-free-queue-and-stack and ran the test suite - all green! Now the output from the locks profiling looks like: --- 72354435197 ns (47.98%), 4008 samples [ 0] java.util.concurrent.locks.ReentrantLock$NonfairSync [ 1] jdk.internal.misc.Unsafe.park [ 2] java.util.concurrent.locks.LockSupport.park [ 3] java.util.concurrent.locks.AbstractQueuedSynchronizer.acquire [ 4] java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireInterruptibly [ 5] java.util.concurrent.locks.ReentrantLock$Sync.lockInterruptibly [ 6] java.util.concurrent.locks.ReentrantLock.lockInterruptibly [ 7] java.util.concurrent.LinkedBlockingQueue.poll [ 8] org.apache.tomcat.util.threads.TaskQueue.poll [ 9] org.apache.tomcat.util.threads.TaskQueue.poll [10] java.util.concurrent.ThreadPoolExecutor.getTask [11] java.util.concurrent.ThreadPoolExecutor.runWorker [12] java.util.concurrent.ThreadPoolExecutor$Worker.run [13] org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run [14] java.lang.Thread.run --- 58413748017 ns (38.74%), 10179 samples [ 0] java.lang.Object [ 1] org.apache.catalina.core.StandardContext$ContextFilterMaps.asArray [ 2]
[tomcat] branch 8.5.x updated: Fix Tomcat 8.5 issue
This is an automated email from the ASF dual-hosted git repository.
remm 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 8ca1377 Fix Tomcat 8.5 issue
8ca1377 is described below
commit 8ca1377197245e1352e4d011cdd0404ba5672551
Author: remm
AuthorDate: Thu Jun 4 17:05:22 2020 +0200
Fix Tomcat 8.5 issue
---
test/org/apache/tomcat/util/net/TesterSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index e144406..bc7aca9 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -222,7 +222,7 @@ public final class TesterSupport {
return
System.getProperty("os.name").toLowerCase(Locale.ENGLISH).startsWith("mac os
x");
}
-protected static boolean isRenegotiationSupported(Tomcat tomcat) {
+public static boolean isRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
// Disabled by default in 1.1.20 windows binary (2010-07-27)
-
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 Tomcat 8.5 issue
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 34341e4 Fix Tomcat 8.5 issue
34341e4 is described below
commit 34341e447e872add752c2aa0605ddef4e622b839
Author: remm
AuthorDate: Thu Jun 4 17:05:22 2020 +0200
Fix Tomcat 8.5 issue
---
test/org/apache/tomcat/util/net/TesterSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 89caf47..5cda3aa 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -220,7 +220,7 @@ public final class TesterSupport {
return ks;
}
-protected static boolean isRenegotiationSupported(Tomcat tomcat) {
+public static boolean isRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
// Disabled by default in 1.1.20 windows binary (2010-07-27)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.56
Am 03.06.20 um 22:51 schrieb Mark Thomas: > The proposed Apache Tomcat 8.5.56 release is now available for voting. > > The notable changes compared to the 8.5.55 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.56/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1271/ > > The tag is: > https://github.com/apache/tomcat/tree/8.5.56 > 4560d2f5a49965f73ed07cb879f17d9c096c9d13 > > The proposed 8.5.56 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 8.5.56 Regards Felix > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (8d20346 -> 5a5f07f)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 8d20346 Add a comment about SRP add 5a5f07f Fix Tomcat 8.5 issue No new revisions were added by this update. Summary of changes: test/org/apache/tomcat/util/net/TesterSupport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64498] Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
--- Comment #4 from BJ Hargrave ---
(In reply to BJ Hargrave from comment #2)
> Bundle-Version: ${cleanup_version;@VERSION@}
That should have been:
Bundle-Version: ${version_cleanup;@VERSION@}
--
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-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/2336 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 1c9652055c28470e4e027591e892c1fe4183db66 Blamelist: Mark Thomas ,remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.36
Am 03.06.20 um 20:06 schrieb Mark Thomas: > The proposed Apache Tomcat 9.0.36 release is now available for voting. > > The notable changes compared to the 9.0.35 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.36/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1270/ > The tag is: > https://github.com/apache/tomcat/tree/9.0.36 > 247c8e5ad08cdcd829a0bfc6374ecb3da0e5838e > > The proposed 9.0.36 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 9.0.36 Regards Felix > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64498] Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498 --- Comment #3 from rotty3000 --- See https://github.com/apache/tomcat/pull/294 -- 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
[GitHub] [tomcat] rotty3000 opened a new pull request #294: Fix BZ 64498 - Incorrect OSGi Manifests
rotty3000 opened a new pull request #294: URL: https://github.com/apache/tomcat/pull/294 https://bz.apache.org/bugzilla/show_bug.cgi?id=64498 Signed-off-by: Raymond Augé This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.0.0-M6
+1 (non binding) Build, checksum and signatures are OK Il giorno mer 3 giu 2020 alle ore 17:14 Mark Thomas ha scritto: > The proposed Apache Tomcat 10.0.0-M6 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to > jakarta.* > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. > > The notable changes compared to 10.0.0-M5 are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M6/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1269/ > The tag is: > https://github.com/apache/tomcat/tree/10.0.0-M6 > 27f7ef8cd0c637b700d564ec20f6ff92901f6b5c > > The proposed 10.0.0-M6 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 10.0.0-M6 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 64498] Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
BJ Hargrave changed:
What|Removed |Added
CC||b...@bjhargrave.com,
||rotty3...@apache.org
--- Comment #2 from BJ Hargrave ---
We need to update the .bnd files to cleanup maven versions for the
Bundle-Version headers. Something like:
Bundle-Version: ${cleanup_version;@VERSION@}
Ray Augé is looking into a PR to fix this.
--
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: Add a comment about SRP
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2b2cea7 Add a comment about SRP
2b2cea7 is described below
commit 2b2cea7b6a6d364f76027357c8da43c7bd2ee2e5
Author: remm
AuthorDate: Thu Jun 4 16:13:48 2020 +0200
Add a comment about SRP
---
java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
index 6489dea..e9ae1d0 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
@@ -29,6 +29,6 @@ public enum Authentication {
GOST94 /* GOST R 34.10-94 signature auth */,
GOST01 /* GOST R 34.10-2001 */,
FZA/* Fortezza */,
-SRP,
+SRP/* Secure Remote Password */,
ANY/* TLS 1.3 */
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add a comment about SRP
This is an automated email from the ASF dual-hosted git repository.
remm 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 1c96520 Add a comment about SRP
1c96520 is described below
commit 1c9652055c28470e4e027591e892c1fe4183db66
Author: remm
AuthorDate: Thu Jun 4 16:13:48 2020 +0200
Add a comment about SRP
---
java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
index 6489dea..e9ae1d0 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
@@ -29,6 +29,6 @@ public enum Authentication {
GOST94 /* GOST R 34.10-94 signature auth */,
GOST01 /* GOST R 34.10-2001 */,
FZA/* Fortezza */,
-SRP,
+SRP/* Secure Remote Password */,
ANY/* TLS 1.3 */
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add a comment about SRP
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8d20346 Add a comment about SRP
8d20346 is described below
commit 8d20346257dcfd0b924d27da501e6fb0ed12c0c2
Author: remm
AuthorDate: Thu Jun 4 16:13:48 2020 +0200
Add a comment about SRP
---
java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
index 6489dea..e9ae1d0 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Authentication.java
@@ -29,6 +29,6 @@ public enum Authentication {
GOST94 /* GOST R 34.10-94 signature auth */,
GOST01 /* GOST R 34.10-2001 */,
FZA/* Fortezza */,
-SRP,
+SRP/* Secure Remote Password */,
ANY/* TLS 1.3 */
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat migration tool for Jakarta EE 0.0.2
On Thu, Jun 4, 2020 at 4:08 PM Emmanuel Bourg wrote: > I'd like to call for a vote to release the version 0.0.2 of the > Jakarta EE migration tool. > > This will be a "tag only" release with no distribution of the binaries > (neither from Apache nor from Maven Central). > > The notable changes compared to 0.0.1 are: > > - An Ant task has been added > > - Inplace file migration is now supported > > - EC signatures are now removed from the migrated jar files > > - Better log formatting when running from the command line > > - New '-verbose' option for the command line > > > Tag: > > https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git;a=commit;h=45d354c1835a1583baf0be02ae77e70fd290f2da > > Source: > https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git > > > The proposed 0.0.2 release is: > [ ] Broken - do not release > [ X ] Beta - go ahead and release as 0.0.2 > I've used latest master today to test Apache Tomcat 10.0.0-M6. Successfully migrated Apache Wicket examples application from master branch (9.x) Regards, Martin
[Bug 64498] Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498 --- Comment #1 from volosied+apa...@gmail.com --- This dash creates parsing issues: parse java.lang.IllegalArgumentException: Invalid version in bundle org.apache.tomcat-el-api=: 10.0.0-M5 at aQute.bnd.osgi.resource.ResourceBuilder.addManifest(ResourceBuilder.java:171) at aQute.bnd.osgi.resource.ResourceBuilder.addFile(ResourceBuilder.java:716) at aQute.bnd.repository.maven.provider.IndexFile.parseSingle(IndexFile.java:289) at aQute.bnd.repository.maven.provider.IndexFile.parseSingleOrMultiFile(IndexFile.java:272) at aQute.bnd.repository.maven.provider.IndexFile.lambda$update$3(IndexFile.java:230 -- 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 64498] New: Incorrect OSGi Manifests
https://bz.apache.org/bugzilla/show_bug.cgi?id=64498 Bug ID: 64498 Summary: Incorrect OSGi Manifests Product: Tomcat 10 Version: 10.0.0-M5 Hardware: All OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: volosied+apa...@gmail.com Target Milestone: -- Hello, As I was incorporating the Tomcat EL bundles in Open Liberty, we noticed the manifests for Tomcat jars are slightly malformed/incorrect. - Bundle-Version should not use a dash: Bundle-Version: 10.0.0-M5 - Export-package is missing the package version The manfiest indicates that these jars were build with Bnd: Tool: Bnd-5.0.1.202003231327 Bnd would not have included the dash, so these may have been edited before being uploaded to maven? Links: https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper-el/10.0.0-M5/ https://repo1.maven.org/maven2/org/apache/tomcat/tomcat-jasper/10.0.0-M5/ And this appears to be the case with others others 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
[VOTE] Release Apache Tomcat migration tool for Jakarta EE 0.0.2
I'd like to call for a vote to release the version 0.0.2 of the Jakarta EE migration tool. This will be a "tag only" release with no distribution of the binaries (neither from Apache nor from Maven Central). The notable changes compared to 0.0.1 are: - An Ant task has been added - Inplace file migration is now supported - EC signatures are now removed from the migrated jar files - Better log formatting when running from the command line - New '-verbose' option for the command line Tag: https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git;a=commit;h=45d354c1835a1583baf0be02ae77e70fd290f2da Source: https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git The proposed 0.0.2 release is: [ ] Broken - do not release [ ] Beta - go ahead and release as 0.0.2 signature.asc Description: OpenPGP digital signature
[tomcat-jakartaee-migration] 02/02: Set the version to 0.0.2
This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git commit 45d354c1835a1583baf0be02ae77e70fd290f2da Author: Emmanuel Bourg AuthorDate: Thu Jun 4 14:33:35 2020 +0200 Set the version to 0.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db13f48..804ba7d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.tomcat jakartaee-migration - 0.0.2-SNAPSHOT + 0.0.2 This tool is a work in progress. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] 01/02: Updated the dependency on Ant (1.10.8)
This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git commit 3b3224d6d861dc45cb9b49b1bbb12b0021acbf88 Author: Emmanuel Bourg AuthorDate: Thu Jun 4 14:28:16 2020 +0200 Updated the dependency on Ant (1.10.8) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6aaa90d..db13f48 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ org.apache.ant ant - 1.10.7 + 1.10.8 provided - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch master updated (102f42a -> 45d354c)
This is an automated email from the ASF dual-hosted git repository. ebourg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git. from 102f42a Change the curve of the EC key to run the tests on OpenJDK 15 or later new 3b3224d Updated the dependency on Ant (1.10.8) new 45d354c Set the version to 0.0.2 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64497] New: jni.SSL.getSessionId returns null
https://bz.apache.org/bugzilla/show_bug.cgi?id=64497 Bug ID: 64497 Summary: jni.SSL.getSessionId returns null Product: Tomcat Native Version: 1.2.23 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: r...@apache.org Target Milestone: --- This can be reproduced using the following Tomcat test and OpenSSL using the build.properties: test.entry=org.apache.catalina.valves.rewrite.TestResolverSSL test.sslImplementation=org.apache.tomcat.util.net.openssl.OpenSSLImplementation In the log, "[SSL_SESSION_ID] null", while many other fields work fine. jni.SSL.getSessionId simply returns null, so no SSL session id. With JSSE, the SSL session id is there. -- 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: Move TestResolverSSL to the rewrite tests
This is an automated email from the ASF dual-hosted git repository.
remm 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 1abf153 Move TestResolverSSL to the rewrite tests
1abf153 is described below
commit 1abf153556fdd64129cf58e4829d0eed1724b6de
Author: remm
AuthorDate: Thu Jun 4 14:13:40 2020 +0200
Move TestResolverSSL to the rewrite tests
Where it really belongs.
---
.../util/net => catalina/valves/rewrite}/TestResolverSSL.java| 5 ++---
test/org/apache/tomcat/util/net/TesterSupport.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestResolverSSL.java
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
similarity index 97%
rename from test/org/apache/tomcat/util/net/TestResolverSSL.java
rename to test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index c17734d..097ce6e 100644
--- a/test/org/apache/tomcat/util/net/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net;
+package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,9 +31,8 @@ import org.apache.catalina.connector.Response;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.ValveBase;
-import org.apache.catalina.valves.rewrite.Resolver;
-import org.apache.catalina.valves.rewrite.ResolverImpl;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.TesterSupport;
public class TestResolverSSL extends TomcatBaseTest {
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index ad8c064..e144406 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -251,7 +251,7 @@ public final class TesterSupport {
return true;
}
-protected static void configureClientCertContext(Tomcat tomcat) {
+public static void configureClientCertContext(Tomcat tomcat) {
TesterSupport.initSsl(tomcat);
/* When running on Java 11, TLSv1.3 is enabled by default. The JSSE
-
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 TestResolverSSL to the rewrite tests
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7c9c546 Move TestResolverSSL to the rewrite tests
7c9c546 is described below
commit 7c9c54668c61f306fe19b8b9ccbb05300f2f3b6f
Author: remm
AuthorDate: Thu Jun 4 14:13:40 2020 +0200
Move TestResolverSSL to the rewrite tests
Where it really belongs.
---
.../util/net => catalina/valves/rewrite}/TestResolverSSL.java| 5 ++---
test/org/apache/tomcat/util/net/TesterSupport.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestResolverSSL.java
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
similarity index 97%
rename from test/org/apache/tomcat/util/net/TestResolverSSL.java
rename to test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index 984e261..2930ae5 100644
--- a/test/org/apache/tomcat/util/net/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net;
+package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,9 +30,8 @@ import org.apache.catalina.connector.Response;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.ValveBase;
-import org.apache.catalina.valves.rewrite.Resolver;
-import org.apache.catalina.valves.rewrite.ResolverImpl;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.TesterSupport;
public class TestResolverSSL extends TomcatBaseTest {
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 75da0fc..89caf47 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -249,7 +249,7 @@ public final class TesterSupport {
return true;
}
-protected static void configureClientCertContext(Tomcat tomcat) {
+public static void configureClientCertContext(Tomcat tomcat) {
TesterSupport.initSsl(tomcat);
/* When running on Java 11, TLSv1.3 is enabled by default. The JSSE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Move TestResolverSSL to the rewrite tests
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c2881f1 Move TestResolverSSL to the rewrite tests
c2881f1 is described below
commit c2881f1ac9602accc46c942f26a30a02eb93ace3
Author: remm
AuthorDate: Thu Jun 4 14:13:40 2020 +0200
Move TestResolverSSL to the rewrite tests
Where it really belongs.
---
.../util/net => catalina/valves/rewrite}/TestResolverSSL.java| 5 ++---
test/org/apache/tomcat/util/net/TesterSupport.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestResolverSSL.java
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
similarity index 97%
rename from test/org/apache/tomcat/util/net/TestResolverSSL.java
rename to test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index d58c3bc..d57d740 100644
--- a/test/org/apache/tomcat/util/net/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.util.net;
+package org.apache.catalina.valves.rewrite;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,9 +30,8 @@ import org.apache.catalina.connector.Response;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.ValveBase;
-import org.apache.catalina.valves.rewrite.Resolver;
-import org.apache.catalina.valves.rewrite.ResolverImpl;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.TesterSupport;
public class TestResolverSSL extends TomcatBaseTest {
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index 71550c1..ff5c2a4 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -250,7 +250,7 @@ public final class TesterSupport {
return true;
}
-protected static void configureClientCertContext(Tomcat tomcat) {
+public static void configureClientCertContext(Tomcat tomcat) {
TesterSupport.initSsl(tomcat);
/* When running on Java 11, TLSv1.3 is enabled by default. The JSSE
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Maven uploads and hashes
On 31/05/2020 00:27, Michael Osipov wrote: > * Clone MRESOLVER, switch to MRESOLVER-56, install locally > * Clone MRESOLVER AT, update MRESOLVER to 1.4.3-SNAPSHOT, install locally > * Use the SNAPSHOT version of the Über JAR for your tests > > I have built Maven 3.7.0-SNAPSHOT and was able to upload checksums to > repository.apache.org. > > Michael > > PS: This is all WIP, comments welcome! Woot! Works a treat. Just uploading an Tomcat 10 snapshot and the additional hashes are present as expected. As soon as there is a release, we can update. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.36
Le 03/06/2020 à 20:06, Mark Thomas a écrit : > The proposed 9.0.36 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.36 Tests are ok on Debian with OpenJDK 11.0.7, Tomcat Native 1.2.24 and OpenSSL 1.1.1g. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.56
On 03/06/2020 21:51, Mark Thomas wrote: > The proposed 8.5.56 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.56 Unit tests pass for NIO, NIO2 and APR/Native (with 1.2.24) on Windows, Linux and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.36
On 03/06/2020 19:06, Mark Thomas wrote: > The proposed 9.0.36 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.36 Unit tests pass for NIO, NIO2 and APR/Native (with 1.2.24) on Windows, Linux and OSX. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.0.0-M6
On 03/06/2020 16:14, Mark Thomas wrote: > The proposed 10.0.0-M6 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 10.0.0-M6 Unit tests pass for NIO, NIO2 and APR/Native (with 1.2.24) on Windows, Linux and OSX. Mark - 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: Increment version number for next dev cycle
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 bd00cb7 Increment version number for next dev cycle bd00cb7 is described below commit bd00cb782513d79cafafedd192f81fbe3447dffd Author: Mark Thomas AuthorDate: Thu Jun 4 12:47:58 2020 +0100 Increment version number for next dev cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index a4b71fc..65854b7 100644 --- a/build.properties.default +++ b/build.properties.default @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=56 +version.build=57 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 3a864fc..523a71f 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.56 +maven.asf.release.deploy.version=8.5.57 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ba4662d..1cf1f14 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - 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: Increment version number fo next dev cycle
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 4685783 Increment version number fo next dev cycle 4685783 is described below commit 4685783e152345974f04aabacbb89e0cbfee12d0 Author: Mark Thomas AuthorDate: Thu Jun 4 12:46:01 2020 +0100 Increment version number fo next dev cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index d3adc67..2103bb7 100644 --- a/build.properties.default +++ b/build.properties.default @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=9 version.minor=0 -version.build=36 +version.build=37 version.patch=0 version.suffix=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 3673726..91d74f5 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=9.0.36 +maven.asf.release.deploy.version=9.0.37 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 6953b49..21e0b64 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Increment version number for next dev cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new da74009 Increment version number for next dev cycle da74009 is described below commit da74009599485dda58d1fadb8e0def64152a9f7f Author: Mark Thomas AuthorDate: Thu Jun 4 12:44:45 2020 +0100 Increment version number for next dev cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 12af31c..19a2f0b 100644 --- a/build.properties.default +++ b/build.properties.default @@ -27,7 +27,7 @@ version.major=10 version.minor=0 version.build=0 version.patch=0 -version.suffix=-M6-dev +version.suffix=-M7-dev # - Source control flags - git.branch=master diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 0cc3bbf..77b33e2 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.0.0-M6 +maven.asf.release.deploy.version=10.0.0-M7 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index db22cf3..fd96675 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -44,7 +44,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64496] Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR]
https://bz.apache.org/bugzilla/show_bug.cgi?id=64496 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas --- Please provide a minimal (ideally a single servlet) test case to reproduce this issue. -- 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 64496] New: Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR]
https://bz.apache.org/bugzilla/show_bug.cgi?id=64496 Bug ID: 64496 Summary: Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR] Product: Tomcat 9 Version: 9.0.35 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: xuep2...@163.com Target Milestone: - Hi Team, I'm developing a web application using spring-boot-starter-webflux(2.1.14.RELEASE),spring-boot-starter-tomcat(2.1.14.RELEASE) and tomcat-embed-core(9.0.35). When I using jmeter for performance testing, an exception occurs. --- The server side exception stack: java.lang.IllegalStateException: Calling [asyncPostProcess()] is not valid for a request with Async state [ERROR] at org.apache.coyote.AsyncStateMachine.asyncPostProcess(AsyncStateMachine.java:290) at org.apache.coyote.AbstractProcessor.asyncPostProcess(AbstractProcessor.java:192) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:81) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1590) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:748) --- The jmeter side exception stack: java.net.SocketException: Connection reset at java.net.SocketInputStream.read(Unknown Source) at java.net.SocketInputStream.read(Unknown Source) at org.apache.http.impl.io.AbstractSessionInputBuffer.fillBuffer(AbstractSessionInputBuffer.java:161) at org.apache.http.impl.io.SocketInputBuffer.fillBuffer(SocketInputBuffer.java:82) at org.apache.http.impl.io.AbstractSessionInputBuffer.readLine(AbstractSessionInputBuffer.java:276) at org.apache.http.impl.conn.DefaultHttpResponseParser.parseHead(DefaultHttpResponseParser.java:138) at org.apache.http.impl.conn.DefaultHttpResponseParser.parseHead(DefaultHttpResponseParser.java:56) at org.apache.http.impl.io.AbstractMessageParser.parse(AbstractMessageParser.java:259) at org.apache.http.impl.AbstractHttpClientConnection.receiveResponseHeader(AbstractHttpClientConnection.java:294) at org.apache.http.impl.conn.DefaultClientConnection.receiveResponseHeader(DefaultClientConnection.java:257) at org.apache.jmeter.protocol.http.sampler.hc.ManagedClientConnectionImpl.receiveResponseHeader(ManagedClientConnectionImpl.java:199) at org.apache.jmeter.protocol.http.sampler.MeasuringConnectionManager$MeasuredConnection.receiveResponseHeader(MeasuringConnectionManager.java:212) at org.apache.http.protocol.HttpRequestExecutor.doReceiveResponse(HttpRequestExecutor.java:273) at org.apache.http.protocol.HttpRequestExecutor.execute(HttpRequestExecutor.java:125) at org.apache.http.impl.client.DefaultRequestDirector.tryExecute(DefaultRequestDirector.java:679) at org.apache.http.impl.client.DefaultRequestDirector.execute(DefaultRequestDirector.java:481) at org.apache.http.impl.client.AbstractHttpClient.doExecute(AbstractHttpClient.java:835) at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:83) at org.apache.jmeter.protocol.http.sampler.HTTPHC4Impl.executeRequest(HTTPHC4Impl.java:697) at org.apache.jmeter.protocol.http.sampler.HTTPHC4Impl.sample(HTTPHC4Impl.java:455) -- 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: [VOTE] Release Apache Tomcat 10.0.0-M6
On Wed, Jun 3, 2020 at 6:14 PM Mark Thomas wrote: > The proposed Apache Tomcat 10.0.0-M6 release is now available for > voting. > > Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary > package for all the specification APIs has changed from javax.* to > jakarta.* > Applications that run on Tomcat 9 will not run on Tomcat 10 without > changes. > > The notable changes compared to 10.0.0-M5 are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.0-M6/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1269/ > The tag is: > https://github.com/apache/tomcat/tree/10.0.0-M6 > 27f7ef8cd0c637b700d564ec20f6ff92901f6b5c > > The proposed 10.0.0-M6 release is: > [ ] Broken - do not release > [ X ] Alpha - go ahead and release as 10.0.0-M6 > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 8.5.56
On Wed, Jun 3, 2020 at 11:51 PM Mark Thomas wrote: > The proposed Apache Tomcat 8.5.56 release is now available for voting. > > The notable changes compared to the 8.5.55 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.56/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1271/ > > The tag is: > https://github.com/apache/tomcat/tree/8.5.56 > 4560d2f5a49965f73ed07cb879f17d9c096c9d13 > > The proposed 8.5.56 release is: > [ ] Broken - do not release > [ X ] Stable - go ahead and release as 8.5.56 > > Regards, Martin > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 9.0.36
On Wed, Jun 3, 2020 at 9:06 PM Mark Thomas wrote: > The proposed Apache Tomcat 9.0.36 release is now available for voting. > > The notable changes compared to the 9.0.35 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.36/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1270/ > The tag is: > https://github.com/apache/tomcat/tree/9.0.36 > 247c8e5ad08cdcd829a0bfc6374ecb3da0e5838e > > The proposed 9.0.36 release is: > [ ] Broken - do not release > [ X ] Stable - go ahead and release as 9.0.36 > Regards, Martin > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 8.5.56
On Wed, Jun 3, 2020 at 10:51 PM Mark Thomas wrote: > The proposed Apache Tomcat 8.5.56 release is now available for voting. > > The notable changes compared to the 8.5.55 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.56/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1271/ > > The tag is: > https://github.com/apache/tomcat/tree/8.5.56 > 4560d2f5a49965f73ed07cb879f17d9c096c9d13 > > The proposed 8.5.56 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.56 > > All three releases look good to me. Rémy
Re: [VOTE] Release Apache Tomcat 9.0.36
On Wed, Jun 3, 2020 at 8:06 PM Mark Thomas wrote: > The proposed Apache Tomcat 9.0.36 release is now available for voting. > > The notable changes compared to the 9.0.35 release are: > > - Add support for ALPN on recent OpenJDK 8 releases. > > - Add support for the CATALINA_OUT_CMD environment variable that defines > a command to which captured stdout and stderr will be redirected. For > use with, for example, rotatelogs. Patch provided by Harald Dunkel. > > - Be more flexible with respect to the ordering of groups, roles and > users in the tomcat-users.xml file > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.36/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1270/ > The tag is: > https://github.com/apache/tomcat/tree/9.0.36 > 247c8e5ad08cdcd829a0bfc6374ecb3da0e5838e > > The proposed 9.0.36 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 9.0.36 > Rémy > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
