Re: [tomcat] 01/03: Fix 64751 - Correct JPMS descriptor for embedded

2020-09-29 Thread Raymond Auge
Nice fix @markt!

This was in my stack of changes from earlier work when we got blocked on
finalizing module naming.

- Ray

On Fri, Sep 18, 2020 at 4:14 PM  wrote:

> 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
>
> commit 57463377fdc13556f80d8ac8f524dbf9684ca377
> Author: Mark Thomas 
> AuthorDate: Fri Sep 18 18:44:07 2020 +0100
>
> Fix 64751 - Correct JPMS descriptor for embedded
> ---
>  build.xml| 3 ++-
>  java/org/apache/juli/logging/LogFactory.java | 3 +++
>  res/checkstyle/org-import-control.xml| 1 +
>  res/ide-support/eclipse/eclipse.classpath| 1 +
>  res/ide-support/idea/tomcat.iml  | 9 +
>  res/ide-support/netbeans/project.xml | 2 +-
>  webapps/docs/changelog.xml   | 4 
>  7 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/build.xml b/build.xml
> index b165c5f..4badeed 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -225,6 +225,7 @@
>
>
>
> +
>  
>  
>  
> @@ -1596,7 +1597,7 @@
>  
>
> -depends="build-manifests,setup-bnd,compile" >
> +depends="build-manifests,setup-bnd,compile,package" >
>
>  
>
> diff --git a/java/org/apache/juli/logging/LogFactory.java
> b/java/org/apache/juli/logging/LogFactory.java
> index 3cd4562..56c805a 100644
> --- a/java/org/apache/juli/logging/LogFactory.java
> +++ b/java/org/apache/juli/logging/LogFactory.java
> @@ -21,6 +21,8 @@ import java.nio.file.FileSystems;
>  import java.util.ServiceLoader;
>  import java.util.logging.LogManager;
>
> +import aQute.bnd.annotation.spi.ServiceConsumer;
> +
>  /**
>   * This is a modified LogFactory that uses a simple {@link ServiceLoader}
> based
>   * discovery mechanism with a default of using JDK based logging. An
> @@ -61,6 +63,7 @@ import java.util.logging.LogManager;
>   * @author Costin Manolache
>   * @author Richard A. Sitze
>   */
> +@ServiceConsumer(value=org.apache.juli.logging.Log.class)
>  public class LogFactory {
>
>  private static final LogFactory singleton = new LogFactory();
> diff --git a/res/checkstyle/org-import-control.xml
> b/res/checkstyle/org-import-control.xml
> index fc69cef..a67ffa2 100644
> --- a/res/checkstyle/org-import-control.xml
> +++ b/res/checkstyle/org-import-control.xml
> @@ -37,6 +37,7 @@
>
>
>
> +  
>
>  
>  
> diff --git a/res/ide-support/eclipse/eclipse.classpath
> b/res/ide-support/eclipse/eclipse.classpath
> index 216c5d4..73e459e 100644
> --- a/res/ide-support/eclipse/eclipse.classpath
> +++ b/res/ide-support/eclipse/eclipse.classpath
> @@ -29,5 +29,6 @@
>   path="TOMCAT_LIBS_BASE/hamcrest-2.2/hamcrest-2.2.jar"/>
>   path="TOMCAT_LIBS_BASE/cglib-3.3.0/cglib-nodep-3.3.0.jar"/>
>   path="TOMCAT_LIBS_BASE/objenesis-3.1/objenesis-3.1.jar"/>
> + path="TOMCAT_LIBS_BASE/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar"/>
>  
>  
> diff --git a/res/ide-support/idea/tomcat.iml
> b/res/ide-support/idea/tomcat.iml
> index 7d3e246..22834db 100644
> --- a/res/ide-support/idea/tomcat.iml
> +++ b/res/ide-support/idea/tomcat.iml
> @@ -110,6 +110,15 @@
>  
>
>  
> +
> +  
> +
> +   url="jar://$TOMCAT_BUILD_LIBS$/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar!/" />
> +
> +
> +
> +  
> +
>
>
>  
> diff --git a/res/ide-support/netbeans/project.xml
> b/res/ide-support/netbeans/project.xml
> index 084b8f5..a78164c 100644
> --- a/res/ide-support/netbeans/project.xml
> +++ b/res/ide-support/netbeans/project.xml
> @@ -178,7 +178,7 @@
>  -->
>  
>  java
> - mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${ant.includes}/
> + mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
>  1.7
>  
>  
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index f1d7a76..26605a0 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -71,6 +71,10 @@
>  Allow using the utility executor for annotation scanning. Patch
>  provided by Jatin Kamnani. (remm)
>
> +  
> +64751: Correct the JPMS module descriptor so the
> embedded
> +JARs may be used with JPMS. (markt)
> +  
>  
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Seni

[Bug 64774] Configuration Reference pages have a wrong version number in their title

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64774

--- Comment #2 from Konstantin Kolinko  ---
I manually patched the published documents, in a hope that search crawlers
would notice the change earlier. (People may be using "Tomcat 10" or "Tomcat 9"
as a search term to limit their search to a specific version.) - r1882138

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



svn commit: r1882138 [3/3] - in /tomcat/site/trunk/docs/tomcat-10.0-doc: architecture/ config/

2020-09-29 Thread kkolinko
Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/manager.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/manager.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/manager.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/manager.html Tue Sep 29 
21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The Manager Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The Manager Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
ElementsClusterManagerChannelChannel/MembershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerweb.xmlFilterOtherSystem propertiesJASPICThe Manager ComponentTable of Contents
 IntroductionAttributesCommon 
AttributesStandard 
ImplementationNested 
ComponentsSpecial 
FeaturesPersistence Across 
RestartsEnable Session 
Persistence

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/realm.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/realm.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/realm.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/realm.html Tue Sep 29 
21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The Realm Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The Realm Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
ElementsClusterManagerChannelChannel/MembershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerweb.xmlFilterOtherSystem propertiesJASPICThe Realm ComponentTable of Contents
 IntroductionAttributesCommon 
AttributesJDBC Database 
Realm - org.apache.catalina.realm.JDBCRealmDataSource
 Database Realm - org.apache.catalina.realm.DataSourceRealmJNDI 
Directory Realm - org.apache.catalina.realm.JNDIRealmUserDatabase
 Realm - org.apache.catalina.realm.UserDatabaseRealmMemory Based 
Realm - org.apache.catalina.realm.MemoryRealmJAAS Realm - 
org.apache.catalina.realm.J
 AASRealmCombined Realm 
- org.apache.catalina.realm.CombinedRealmLockOut Realm - 
org.apache.catalina.realm.LockOutRealmNull Realm - 
org.apache.catalina.realm.NullRealmAuthenticated
 User Realm - 
org.apache.catalina.realm.AuthenticatedUserRealmNested ComponentsSpecial Features

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/resources.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/resources.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/resources.html Tue Sep 29 
21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The Resources Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The Resources Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
E

svn commit: r1882138 [2/3] - in /tomcat/site/trunk/docs/tomcat-10.0-doc: architecture/ config/

2020-09-29 Thread kkolinko
Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/cookie-processor.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/cookie-processor.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/cookie-processor.html 
(original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/cookie-processor.html Tue Sep 
29 21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The Cookie Processor Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The Cookie Processor Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
ElementsClusterManagerChannelChannel/MembershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerweb.xmlFilterOtherSystem propertiesJASPICThe Cookie Processor ComponentTable of Contents
 IntroductionAttributesCommon 
AttributesStandard 
ImplementationLegacy
 Cookie Processor - 
org.apache.tomcat.util.http.LegacyCookieProcessorNested ComponentsSpecial Features

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/credentialhandler.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/credentialhandler.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/credentialhandler.html 
(original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/credentialhandler.html Tue 
Sep 29 21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The CredentialHandler Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The CredentialHandler Componenthttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
ElementsClusterManagerChannelChannel/MembershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerweb.xmlFilterOtherSystem propertiesJASPICThe CredentialHandler ComponentTable of Contents
 IntroductionAttributesCommon 
AttributesMessageDigestCredentialHandlerNestedCredentialHandlerSecretKeyCredentialHandlerNested ComponentsSpecial Features

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/config/engine.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/config/engine.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/config/engine.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/config/engine.html Tue Sep 29 
21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Configuration Reference (10.0.0-M8) - 
The Engine Containerhttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Configuration 
Reference
+Apache Tomcat 10 Configuration Reference (10.0.0-M8) - 
The Engine Containerhttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Configuration 
Reference
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeConfig Ref. 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level 
ElementsServerServiceExecutorsExecutorConnectorsHTTP/1.1HTTP/2AJPContainersContextEngineHostClusterNested 
ComponentsCookieProcessorCredentialHandlerGlobal ResourcesJarScannerJarScanFilterListenersLoaderManagerRealmResourcesSessionIdGeneratorValveCluster 
ElementsClusterManagerChannelChannel/MembershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerweb.xmlFilterOtherSystem propertiesJASPICThe Engine ContainerTable of Contents
 IntroductionAttributesCommon 
AttributesStandard 
ImplementationNested 
ComponentsSpecial 
FeaturesLoggingAccess LogsLifecycle ListenersRequest Filters

Modified: tomc

svn commit: r1882138 [1/3] - in /tomcat/site/trunk/docs/tomcat-10.0-doc: architecture/ config/

2020-09-29 Thread kkolinko
Author: kkolinko
Date: Tue Sep 29 21:16:04 2020
New Revision: 1882138

URL: http://svn.apache.org/viewvc?rev=1882138&view=rev
Log:
Manually update the published documentation for Tomcat 10 to fix a version 
number typo in titles of documents.
https://bz.apache.org/bugzilla/show_bug.cgi?id=64774

Modified:
tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/index.html
tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/overview.html
tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/requestProcess.html
tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/startup.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/ajp.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/automatic-deployment.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-channel.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-deployer.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-interceptor.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-listener.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-manager.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-membership.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-receiver.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-sender.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster-valve.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cluster.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/context.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/cookie-processor.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/credentialhandler.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/engine.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/executor.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/filter.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/globalresources.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/host.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/http.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/http2.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/index.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/jar-scan-filter.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/jar-scanner.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/jaspic.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/listeners.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/loader.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/manager.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/realm.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/resources.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/server.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/service.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/sessionidgenerator.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/systemprops.html
tomcat/site/trunk/docs/tomcat-10.0-doc/config/valve.html

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/index.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/index.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/index.html Tue Sep 29 
21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Architecture (10.0.0-M8) - Table of 
Contentshttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Architecture
+Apache Tomcat 10 Architecture (10.0.0-M8) - Table of 
Contentshttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Architecture
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeArchitecture 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser 
CommentsContentsContentsOverviewServer 
StartupRequest 
ProcessTable of ContentsPreface
 

Modified: tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/overview.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/overview.html?rev=1882138&r1=1882137&r2=1882138&view=diff
==
--- tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/overview.html (original)
+++ tomcat/site/trunk/docs/tomcat-10.0-doc/architecture/overview.html Tue Sep 
29 21:16:04 2020
@@ -1,5 +1,5 @@
 
-Apache Tomcat 9 Architecture (10.0.0-M8) - Architecture 
Overviewhttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 9 Architecture
+Apache Tomcat 10 Architecture (10.0.0-M8) - Architecture 
Overviewhttps://tomcat.apache.org/";>https://www.apache.org/"; target="_blank">Apache Tomcat 10 Architecture
 Version 10.0.0-M8,
 Sep 9 2020LinksDocs HomeArchitecture 
Homehttps://wiki.apache.org/tomcat/FAQ";>FAQUser 
CommentsContentsCo

[tomcat] branch master updated: Correct typos in the changelog.

2020-09-29 Thread kkolinko
This is an automated email from the ASF dual-hosted git repository.

kkolinko 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 681f2af  Correct typos in the changelog.
681f2af is described below

commit 681f2afccc2f22ff5fc3d80ad7e77dbeecd083b2
Author: Konstantin Kolinko 
AuthorDate: Tue Sep 29 23:55:28 2020 +0300

Correct typos in the changelog.
---
 webapps/docs/changelog.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4bd4408..b6ee041 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,7 +86,7 @@
   
   
 Throw SQLException instead of
-NullpointerException when failing to connect to the
+NullPointerException when failing to connect to the
 database. (kfujino)
   
   
@@ -150,7 +150,7 @@
   
 
   
-Configure the Manager and Host Manager applications to set
+Configure the Manager and Host Manager web applications to set
 SameSite=strict for all cookies, including session 
cookies,
 created by the application. (markt)
   
@@ -160,8 +160,8 @@
 Manager web application. (markt)
   
   
-64774: Review references to Tomcat 9 in the the 
documentation
-web application and remove them or upadte them to refer to Tomact 10 as
+64774: Review references to Tomcat 9 in the documentation
+web application and remove them or update them to refer to Tomcat 10 as
 appropriate. (markt)
   
 
@@ -171,7 +171,7 @@
   
 Update to Commons Daemon 1.2.3. This adds support to jsvc for
 --enable-preview and native memory tracking (Procrun
-already supported these features), adds some addition debug logging and
+already supported these features), adds some additional debug logging 
and
 adds a new feature to Procrun that outputs the command to 
(re-)configure
 the service with the current settings. (markt)
   


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



[Bug 64778] org.apache.el.lang.ELSupport: methods removed

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64778

--- Comment #4 from Paul Nicolucci  ---
Mark, you're correct regarding EE7/EE8 however that same jsp core
implementation is used in our WebSphere Liberty EE6 implementation.

We can add these methods to our fork of the code which I've done here:
https://github.com/OpenLiberty/open-liberty/issues/14111 I was just trying to
see if we could update the EL implementation directly to avoid keeping an
overlay such as this.

However, it seems the community does not want to do this and that is
understandable. 

I can see about updating our JSP sources to perhaps use the EL API to avoid
this in the future as well.

Thanks!

-- 
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 64778] org.apache.el.lang.ELSupport: methods removed

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64778

--- Comment #3 from Mark Thomas  ---
After looking at the Open Liberty documentation and source code I fell like I
am missing a large chunk of context.

The docs only refer to Java EE 7 and Java EE 8.

A search via GitHub only found one place where coerceToNumber(Object,Class) was
called in the current code base.

I don't understand why a JSP implementation would be calling directly into an
EL implementation rather than using the EL API.

I looks like you have a copy/fork of Tomcat's EL implementation so dos that
mean adding the methods you need to your local copy/fork is an alternative
option?

I guess the bit I am really missing is an understanding of the dependency chain
of each currently supported Open Liberty version to Tomcat's EL implementation
and the nature of each of those dependencies.

-- 
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 64765] ThreadPoolExecutor#submittedCount wrong after undeploy

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64765

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Thanks for the report and for the analysis.

Fixed in:
- master for 10.0.0-M9 onwards
- 9.0.x for 9.0.39 onwards
- 8.5.x for 8.5.59 onwards
- 7.0.x for 7.0.107 onwards

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



[tomcat] branch 7.0.x updated: Fix BZ 64765 correctly track submitted count on undeploy

2020-09-29 Thread markt
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 ab59b92  Fix BZ 64765 correctly track submitted count on undeploy
ab59b92 is described below

commit ab59b92412795103c71b61d784446e595c33df20
Author: Mark Thomas 
AuthorDate: Tue Sep 29 20:54:00 2020 +0100

Fix BZ 64765 correctly track submitted count on undeploy

https://bz.apache.org/bugzilla/show_bug.cgi?id=64765
Fix double counting when undeploying a web application with long running
requests when renewThreadsWhenStoppingContext is enabled
---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 8 +++-
 webapps/docs/changelog.xml  | 7 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 7298efa..b3fab86 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -92,7 +92,13 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 @Override
 protected void afterExecute(Runnable r, Throwable t) {
-submittedCount.decrementAndGet();
+// Throwing StopPooledThreadException is likely to cause this method to
+// be called more than once for a given task based on the typical
+// implementations of the parent class. This test ensures that
+// decrementAndGet() is only called once after each task execution.
+if (!(t instanceof StopPooledThreadException)) {
+submittedCount.decrementAndGet();
+}
 
 if (t == null) {
 stopCurrentThreadIfNeeded();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0e3ff4c..4471506 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -66,6 +66,13 @@
 Correct numerous spellings throughout the code base. Based on a pull
 request from John Bampton. (markt)
   
+  
+64765: Ensure that the number of currently processing 
threads
+is tracked correctly when a web application is undeployed, long running
+requests are being processed and
+renewThreadsWhenStoppingContext is enabled for the web
+application. (markt)
+  
 
   
   


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



[tomcat] branch 8.5.x updated: Fix BZ 64765 correctly track submitted count on undeploy

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 51332a0  Fix BZ 64765 correctly track submitted count on undeploy
51332a0 is described below

commit 51332a0668dafc70e0dc031808850a739fb53320
Author: Mark Thomas 
AuthorDate: Tue Sep 29 20:54:00 2020 +0100

Fix BZ 64765 correctly track submitted count on undeploy

https://bz.apache.org/bugzilla/show_bug.cgi?id=64765
Fix double counting when undeploying a web application with long running
requests when renewThreadsWhenStoppingContext is enabled
---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 8 +++-
 webapps/docs/changelog.xml  | 7 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 7298efa..b3fab86 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -92,7 +92,13 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 @Override
 protected void afterExecute(Runnable r, Throwable t) {
-submittedCount.decrementAndGet();
+// Throwing StopPooledThreadException is likely to cause this method to
+// be called more than once for a given task based on the typical
+// implementations of the parent class. This test ensures that
+// decrementAndGet() is only called once after each task execution.
+if (!(t instanceof StopPooledThreadException)) {
+submittedCount.decrementAndGet();
+}
 
 if (t == null) {
 stopCurrentThreadIfNeeded();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc45d86..3cfd81f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,6 +67,13 @@
 NullpointerException when failing to connect to the
 database. (kfujino)
   
+  
+64765: Ensure that the number of currently processing 
threads
+is tracked correctly when a web application is undeployed, long running
+requests are being processed and
+renewThreadsWhenStoppingContext is enabled for the web
+application. (markt)
+  
 
   
   


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



[tomcat] branch 9.0.x updated: Fix BZ 64765 correctly track submitted count on undeploy

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new cb64ef6  Fix BZ 64765 correctly track submitted count on undeploy
cb64ef6 is described below

commit cb64ef6ada0c1e98c0db9819ff15743d1ba6769e
Author: Mark Thomas 
AuthorDate: Tue Sep 29 20:54:00 2020 +0100

Fix BZ 64765 correctly track submitted count on undeploy

https://bz.apache.org/bugzilla/show_bug.cgi?id=64765
Fix double counting when undeploying a web application with long running
requests when renewThreadsWhenStoppingContext is enabled
---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 8 +++-
 webapps/docs/changelog.xml  | 7 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 7298efa..b3fab86 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -92,7 +92,13 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 @Override
 protected void afterExecute(Runnable r, Throwable t) {
-submittedCount.decrementAndGet();
+// Throwing StopPooledThreadException is likely to cause this method to
+// be called more than once for a given task based on the typical
+// implementations of the parent class. This test ensures that
+// decrementAndGet() is only called once after each task execution.
+if (!(t instanceof StopPooledThreadException)) {
+submittedCount.decrementAndGet();
+}
 
 if (t == null) {
 stopCurrentThreadIfNeeded();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9519118..0be3539 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -88,6 +88,13 @@
 NullpointerException when failing to connect to the
 database. (kfujino)
   
+  
+64765: Ensure that the number of currently processing 
threads
+is tracked correctly when a web application is undeployed, long running
+requests are being processed and
+renewThreadsWhenStoppingContext is enabled for the web
+application. (markt)
+  
 
   
   


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



[tomcat] branch master updated: Fix BZ 64765 correctly track submitted count on undeploy

2020-09-29 Thread markt
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 311  Fix BZ 64765 correctly track submitted count on undeploy
311 is described below

commit 3117d30182d99188b313de46590de8864889
Author: Mark Thomas 
AuthorDate: Tue Sep 29 20:54:00 2020 +0100

Fix BZ 64765 correctly track submitted count on undeploy

https://bz.apache.org/bugzilla/show_bug.cgi?id=64765
Fix double counting when undeploying a web application with long running
requests when renewThreadsWhenStoppingContext is enabled
---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 8 +++-
 webapps/docs/changelog.xml  | 7 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java 
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 7298efa..b3fab86 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -92,7 +92,13 @@ public class ThreadPoolExecutor extends 
java.util.concurrent.ThreadPoolExecutor
 
 @Override
 protected void afterExecute(Runnable r, Throwable t) {
-submittedCount.decrementAndGet();
+// Throwing StopPooledThreadException is likely to cause this method to
+// be called more than once for a given task based on the typical
+// implementations of the parent class. This test ensures that
+// decrementAndGet() is only called once after each task execution.
+if (!(t instanceof StopPooledThreadException)) {
+submittedCount.decrementAndGet();
+}
 
 if (t == null) {
 stopCurrentThreadIfNeeded();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c5ce8ec..4bd4408 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,13 @@
 NullpointerException when failing to connect to the
 database. (kfujino)
   
+  
+64765: Ensure that the number of currently processing 
threads
+is tracked correctly when a web application is undeployed, long running
+requests are being processed and
+renewThreadsWhenStoppingContext is enabled for the web
+application. (markt)
+  
 
   
   


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



[Bug 64778] org.apache.el.lang.ELSupport: methods removed

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64778

--- Comment #2 from Paul Nicolucci  ---
We're mainly just noticing it now since we're using the latest version of the
EL. We hit a similar issue a few years back but it doesn't look like it was
ever raised here. 

Since our JSP container supports EL implementations from tomcat going back to
EE6 it would be difficult to remove this dependency and still work across all
implementations unless we updated the JSP engine as well as all the EL
implementations. It doesn't look as though the ELSupport was updated for tomcat
7 so we'd be in a position where our JSP engine can't use one set of ELSupport
methods for all of the implementations of EL.

So mainly an issue of consistency across versions.

-- 
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 64778] org.apache.el.lang.ELSupport: methods removed

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64778

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
This code was removed 6 years and two major versions ago. I'm curious as to why
this is only being raised as an issue now.

My objection to restoring those methods is that they are essentially cruft.

Is there a reason the calls can't be updated to use the new method signature?

-- 
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 64778] New: org.apache.el.lang.ELSupport: methods removed

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64778

Bug ID: 64778
   Summary: org.apache.el.lang.ELSupport: methods removed
   Product: Tomcat 10
   Version: 10.0.0-M8
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: pnicolu...@gmail.com
  Target Milestone: --

In versions of Tomcat EL after 7.0 (8.5/9/10) some ELSupport methods were
removed. For example:

public static final Number coerceToNumber(final Object obj,
final Class type) throws ELException {

It was replaced with:

 public static final Number coerceToNumber(final ELContext ctx, final Object
obj,
final Class type) throws ELException {

Would there be any objection to keeping the method and just calling into the
new method such as:

public static final Number coerceToNumber(final Object obj,
final Class type) throws ELException {
return coerceToNumber(null, obj, type);
}

The Tomcat EL is used in OpenLiberty and the JSP engine supports Java EE6+ and
uses the "ELSupport.coerceToNumber(obj,type)" method. Removing it from the EL
causes some issues as it exists in some implementations of the EL and not in
others.

As far as I can tell it was removed here:
https://github.com/apache/tomcat/commit/7188bef15866902ad5fd76d41c63318cf3463de7#diff-13b383a5ea3f46e7d0badca7edcfbdec

I'm willing to create a PR for these changes if no objections. There are a
number of other ELSupport methods that were changed in a similar way and I
would propose we do a similar change for them 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



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

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57129

--- Comment #31 from Mateusz Matela  ---
(In reply to Christopher Schultz from comment #29)
> > Can you explain why this has to be optional?
>
> Because it's very nearly a spec violation.

That's a big stretch. If the spec doesn't specify some aspect of behavior, is
it really the best approach to derive this behavior from some unrelated
circumstances like the underlying file system?

> Assuming that users never switch
> application servers, it's probably harmless. But if you use a sorting-Tomcat
> and move to JBoss and your stuff stops working,

So you consider it a harm when some apps stop working on migration from Tomcat
to JBoss, but it's good if they stop working on migration between versions of
Tomcat? I see no logic here.

> JBoss will tell you the same
> thing: you were relying on some wacky behavior those crazy kids at Apache
> Tomcat were willing to do, and now you have to grow up and adhere to
> published specifications.

You can call it wacky, I call it practical.
What is your point here? Do you think that after this change people will get
angry at Tomcat (more than in this bug) and demand that their apps stop working
too? Going further this way, maybe there should be a config for more
randomization in jar loading so that "incorrect" apps fail more often?

> Why do you have JAR files that rely on specific ordering to
> maintain determinism? I can't understand why someone would build an
> application like that.

Oh well, so I don't live in a perfect world and my apps are not perfect. But I
lived with these imperfections for many years and everything was fine. Until
someone in their ivory tower decided that these imperfections are actually more
important than anything else I might want to work on... Or that I'm not worthy
to use newer versions of Tomcat. Oh, thank you, Master!

-- 
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 57129] Regression. Load WEB-INF/lib jarfiles in alphabetical order

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57129

Mateusz Matela  changed:

   What|Removed |Added

 CC||mateusz.mat...@gmail.com

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



[Bug 56148] support (multiple) ocsp stapling

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56148

--- Comment #13 from Mark Thomas  ---
(In reply to Azat from comment #12)
> (In reply to Mark Thomas from comment #11)
> > It is on the TODO list but there are quite a few things ahead of it on the
> > list.
> 
> Couple of questions to Mark related to this bug:
> 1) is this enhancement request still on your TODO list?

Yes.

> 2) if this issue doesn't get implemented before tomcat 7 EOL date next March
> what will happen with it? Do I then  need to generate a new bugzilla issue
> against Tomcat 8.5?

No. We'll review all the open 7.0.x issues at that point and unless they are
Tomcat 7.0.x specific (most aren't) we'll bulk update them to 8.5.x.

-- 
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 56148] support (multiple) ocsp stapling

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56148

--- Comment #12 from Azat  ---
(In reply to Mark Thomas from comment #11)
> It is on the TODO list but there are quite a few things ahead of it on the
> list.

Couple of questions to Mark related to this bug:
1) is this enhancement request still on your TODO list?
2) if this issue doesn't get implemented before tomcat 7 EOL date next March
what will happen with it? Do I then  need to generate a new bugzilla issue
against Tomcat 8.5?

-- 
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: Removing the APR connector

2020-09-29 Thread Christopher Schultz
Rémy,

On 9/29/20 07:57, Rémy Maucherat wrote:
> On Tue, Sep 29, 2020 at 1:32 PM Mark Thomas  wrote:
> 
>> All,
>>
>> Removing the APR connector (HTTP and AJP) is currently on the TODO list
>> for Tomcat 10.0.x (i.e. the current development branch).
>>
>> I am wondering whether we are still happy with this plan as we have had
>> a few 10.0.x milestone releases and we haven't made any efforts to
>> remove the APR connector.
>>
>> I'm happy to remove APR from 10.0.x but I am equally happy postponing
>> this to a later release if necessary.
>>
>> We'd still need Tomcat Native support to enable the use of OpenSSL with
>> NIO and NIO2. I am only thinking of removing the APR based HTTP and AJP
>> connectors (with associated plumbing) and possibly some of the
>> org.apache.tomcat.jni package.
>>
>> Thoughts?
> 
> I would rather postpone at this point, with the idea of really removing it
> in 10.1.

I don't know how popular the APR connector is. There are probably lots
of users who use it because "it's the fastest" and they haven't changed
since 2005.

I also don't know how many users are actually using NIO+OpenSSL. APR is
well-known to be reliable and has good performance. I think the
NIO+OpenSSL is less popularly deployed. Is it "too fast" to remove it in
10.0?

> Maybe we should remove it from the docs in 10.0 in preparation for the move
> ?

I wouldn't remove it from the docs, but maybe very clearly advertise
that it's being removed.

-chris

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



RE: Removing the APR connector

2020-09-29 Thread jonmcalexander
👍coolio


Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com


This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.


-Original Message-
From: Mark Thomas  
Sent: Tuesday, September 29, 2020 10:54 AM
To: dev@tomcat.apache.org
Subject: Re: Removing the APR connector

On 29/09/2020 16:29, jonmcalexan...@wellsfargo.com.INVALID wrote:
> I know I'm not a contributor, but what is the reason for removing the APR 
> Connector?

It is inherently less stable. If we get the NIO code wrong, you might see a 
NullPointerException. If we get the APR code wrong you might see a JVM crash.

The primary benefit when the connector was first introduced was performance. 
With current JVMs HTTP performance of pure Java connectors is broadly similar 
to the APR/Native connector. For HTTPS, APR/Native still provides a performance 
boost but we see a similar performance boost when we use APR/Native to plug 
OpenSSL into NIO or NIO2 and that requires less native code (and hence is less 
prune to stability issues).

In short, we can get the same benefits as the APR connector with
NIO+OpenSSL with less native code and hence less risk.

There are secondary benefits in terms of where we can clean up some of the 
Tomcat internals if we only need to support two connectors (NIO and
NIO2) rather than 3.

Mark

> 
> 
> Dream * Excel * Explore * Inspire
> Jon McAlexander
> Infrastructure Engineer
> Asst Vice President
> 
> Middleware Product Engineering
> Enterprise CIO | Platform Services | Middleware | Infrastructure 
> Solutions
> 
> 8080 Cobblestone Rd | Urbandale, IA 50322
> MAC: F4469-010
> Tel 515-988-2508 | Cell 515-988-2508
> 
> jonmcalexan...@wellsfargo.com
> 
> 
> This message may contain confidential and/or privileged information. If you 
> are not the addressee or authorized to receive this for the addressee, you 
> must not use, copy, disclose, or take any action based on this message or any 
> information herein. If you have received this message in error, please advise 
> the sender immediately by reply e-mail and delete this message. Thank you for 
> your cooperation.
> 
> 
> -Original Message-
> From: Rémy Maucherat 
> Sent: Tuesday, September 29, 2020 6:58 AM
> To: Tomcat Developers List 
> Subject: Re: Removing the APR connector
> 
> On Tue, Sep 29, 2020 at 1:32 PM Mark Thomas  wrote:
> 
>> All,
>>
>> Removing the APR connector (HTTP and AJP) is currently on the TODO 
>> list for Tomcat 10.0.x (i.e. the current development branch).
>>
>> I am wondering whether we are still happy with this plan as we have 
>> had a few 10.0.x milestone releases and we haven't made any efforts 
>> to remove the APR connector.
>>
>> I'm happy to remove APR from 10.0.x but I am equally happy postponing 
>> this to a later release if necessary.
>>
>> We'd still need Tomcat Native support to enable the use of OpenSSL 
>> with NIO and NIO2. I am only thinking of removing the APR based HTTP 
>> and AJP connectors (with associated plumbing) and possibly some of 
>> the org.apache.tomcat.jni package.
>>
>> Thoughts?
>>
> 
> I would rather postpone at this point, with the idea of really removing it in 
> 10.1.
> Maybe we should remove it from the docs in 10.0 in preparation for the move ?
> 
> Rémy
> 
> 
>>
>> Mark
>>
>> -
>> 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
> 


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



Re: Removing the APR connector

2020-09-29 Thread Mark Thomas
On 29/09/2020 16:29, jonmcalexan...@wellsfargo.com.INVALID wrote:
> I know I'm not a contributor, but what is the reason for removing the APR 
> Connector?

It is inherently less stable. If we get the NIO code wrong, you might
see a NullPointerException. If we get the APR code wrong you might see a
JVM crash.

The primary benefit when the connector was first introduced was
performance. With current JVMs HTTP performance of pure Java connectors
is broadly similar to the APR/Native connector. For HTTPS, APR/Native
still provides a performance boost but we see a similar performance
boost when we use APR/Native to plug OpenSSL into NIO or NIO2 and that
requires less native code (and hence is less prune to stability issues).

In short, we can get the same benefits as the APR connector with
NIO+OpenSSL with less native code and hence less risk.

There are secondary benefits in terms of where we can clean up some of
the Tomcat internals if we only need to support two connectors (NIO and
NIO2) rather than 3.

Mark

> 
> 
> Dream * Excel * Explore * Inspire
> Jon McAlexander
> Infrastructure Engineer
> Asst Vice President
> 
> Middleware Product Engineering
> Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions
> 
> 8080 Cobblestone Rd | Urbandale, IA 50322
> MAC: F4469-010
> Tel 515-988-2508 | Cell 515-988-2508
> 
> jonmcalexan...@wellsfargo.com
> 
> 
> This message may contain confidential and/or privileged information. If you 
> are not the addressee or authorized to receive this for the addressee, you 
> must not use, copy, disclose, or take any action based on this message or any 
> information herein. If you have received this message in error, please advise 
> the sender immediately by reply e-mail and delete this message. Thank you for 
> your cooperation.
> 
> 
> -Original Message-
> From: Rémy Maucherat  
> Sent: Tuesday, September 29, 2020 6:58 AM
> To: Tomcat Developers List 
> Subject: Re: Removing the APR connector
> 
> On Tue, Sep 29, 2020 at 1:32 PM Mark Thomas  wrote:
> 
>> All,
>>
>> Removing the APR connector (HTTP and AJP) is currently on the TODO 
>> list for Tomcat 10.0.x (i.e. the current development branch).
>>
>> I am wondering whether we are still happy with this plan as we have 
>> had a few 10.0.x milestone releases and we haven't made any efforts to 
>> remove the APR connector.
>>
>> I'm happy to remove APR from 10.0.x but I am equally happy postponing 
>> this to a later release if necessary.
>>
>> We'd still need Tomcat Native support to enable the use of OpenSSL 
>> with NIO and NIO2. I am only thinking of removing the APR based HTTP 
>> and AJP connectors (with associated plumbing) and possibly some of the 
>> org.apache.tomcat.jni package.
>>
>> Thoughts?
>>
> 
> I would rather postpone at this point, with the idea of really removing it in 
> 10.1.
> Maybe we should remove it from the docs in 10.0 in preparation for the move ?
> 
> Rémy
> 
> 
>>
>> Mark
>>
>> -
>> 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
> 


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



RE: Removing the APR connector

2020-09-29 Thread jonmcalexander
I know I'm not a contributor, but what is the reason for removing the APR 
Connector?


Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com


This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.


-Original Message-
From: Rémy Maucherat  
Sent: Tuesday, September 29, 2020 6:58 AM
To: Tomcat Developers List 
Subject: Re: Removing the APR connector

On Tue, Sep 29, 2020 at 1:32 PM Mark Thomas  wrote:

> All,
>
> Removing the APR connector (HTTP and AJP) is currently on the TODO 
> list for Tomcat 10.0.x (i.e. the current development branch).
>
> I am wondering whether we are still happy with this plan as we have 
> had a few 10.0.x milestone releases and we haven't made any efforts to 
> remove the APR connector.
>
> I'm happy to remove APR from 10.0.x but I am equally happy postponing 
> this to a later release if necessary.
>
> We'd still need Tomcat Native support to enable the use of OpenSSL 
> with NIO and NIO2. I am only thinking of removing the APR based HTTP 
> and AJP connectors (with associated plumbing) and possibly some of the 
> org.apache.tomcat.jni package.
>
> Thoughts?
>

I would rather postpone at this point, with the idea of really removing it in 
10.1.
Maybe we should remove it from the docs in 10.0 in preparation for the move ?

Rémy


>
> 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: Add 8.5.58 release date

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 8f0c834  Add 8.5.58 release date
8f0c834 is described below

commit 8f0c8347042b44f6e0371187ed5d61c09de55b72
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:48:18 2020 +0100

Add 8.5.58 release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 969147d..fc45d86 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,7 +147,7 @@
 
   
 
-
+
   
 
   


-
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 9.0.38 release date

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 224b59d  Add 9.0.38 release date
224b59d is described below

commit 224b59de10fb7d10b0d2f980c6d09ae7043956f8
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:47:29 2020 +0100

Add 9.0.38 release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4924519..9519118 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,7 +182,7 @@
 
   
 
-
+
   
 
   


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



[tomcat] branch master updated: Add 10.0.0-M8 release date

2020-09-29 Thread markt
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 042f672  Add 10.0.0-M8 release date
042f672 is described below

commit 042f6726d2276ca43d0ea8bbdc51ffbc7f060aa5
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:46:31 2020 +0100

Add 10.0.0-M8 release date
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1efb76d..c5ce8ec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -193,7 +193,7 @@
 
   
 
-
+
   
 
   


-
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: Correct location

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 60f104a  Correct location
60f104a is described below

commit 60f104a7224aa33d1f5f490542ff9576849375f2
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:36:38 2020 +0100

Correct location
---
 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 3f02e3a..969147d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,10 +94,6 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
-  
-Fix running service.bat when called from $CATALINA_HOME.
-(markt)
-  
 
   
   
@@ -144,6 +140,10 @@
 Expand coverage of Russian translations. Pull request provided by
 Nikolay Gribanov. (markt)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
 


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



[tomcat] branch 9.0.x updated: Correct location

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 15a058d  Correct location
15a058d is described below

commit 15a058d7c3b5ac8db23d46c3f4d678563e222b47
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:31:11 2020 +0100

Correct location
---
 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 88ff2ac..4924519 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,10 +123,6 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
-  
-Fix running service.bat when called from $CATALINA_HOME.
-(markt)
-  
 
   
   
@@ -179,6 +175,10 @@
   
 Update the CXF module to Apache CXF 3.4.0. (remm)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
 


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



[tomcat] branch master updated: Correct location

2020-09-29 Thread markt
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 03abece  Correct location
03abece is described below

commit 03abecea22a02dc3909f0d4f8a6f0e46d63a2dff
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:31:11 2020 +0100

Correct location
---
 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 42032aa..1efb76d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,10 +129,6 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
-  
-Fix running service.bat when called from $CATALINA_HOME.
-(markt)
-  
 
   
   
@@ -190,6 +186,10 @@
   
 Update the CXF module to Apache CXF 3.4.0. (remm)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
 


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



[tomcat] branch 7.0.x updated: Fix calling service.bat from CATALINA_HOME

2020-09-29 Thread markt
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 f3e3217  Fix calling service.bat from CATALINA_HOME
f3e3217 is described below

commit f3e32170d5d331ad38a86bda37f5911ef8a8a734
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:16:04 2020 +0100

Fix calling service.bat from CATALINA_HOME
---
 bin/service.bat| 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/service.bat b/bin/service.bat
index b170e64..b6a2d86 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -75,8 +75,8 @@ rem Check the environment
 rem Guess CATALINA_HOME if not defined
 if not "%CATALINA_HOME%" == "" goto gotHome
 set "CATALINA_HOME=%cd%"
-if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome
-if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome
+if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome
 rem CD to the upper dir
 cd ..
 set "CATALINA_HOME=%cd%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0f65809..0e3ff4c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -95,6 +95,10 @@
 Updated to Ant 1.9.1. The build now requires a minimum of Ant 1.9.1.
 (markt)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
 


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



[tomcat] branch 8.5.x updated: Fix calling service.bat from CATALINA_HOME

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 371faea2 Fix calling service.bat from CATALINA_HOME
371faea2 is described below

commit 371faea24bb9716ed9ff749ad6674f51c61ef701
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:16:04 2020 +0100

Fix calling service.bat from CATALINA_HOME
---
 bin/service.bat| 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/service.bat b/bin/service.bat
index b170e64..b6a2d86 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -75,8 +75,8 @@ rem Check the environment
 rem Guess CATALINA_HOME if not defined
 if not "%CATALINA_HOME%" == "" goto gotHome
 set "CATALINA_HOME=%cd%"
-if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome
-if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome
+if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome
 rem CD to the upper dir
 cd ..
 set "CATALINA_HOME=%cd%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5cbbe9a..3f02e3a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,10 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
   


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



[tomcat] branch 9.0.x updated: Fix calling service.bat from CATALINA_HOME

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7514e57  Fix calling service.bat from CATALINA_HOME
7514e57 is described below

commit 7514e57f1559901952af614eb16240b5e9c512e8
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:16:04 2020 +0100

Fix calling service.bat from CATALINA_HOME
---
 bin/service.bat| 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/service.bat b/bin/service.bat
index b170e64..b6a2d86 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -75,8 +75,8 @@ rem Check the environment
 rem Guess CATALINA_HOME if not defined
 if not "%CATALINA_HOME%" == "" goto gotHome
 set "CATALINA_HOME=%cd%"
-if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome
-if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome
+if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome
 rem CD to the upper dir
 cd ..
 set "CATALINA_HOME=%cd%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 93babdf..88ff2ac 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -123,6 +123,10 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
   


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



[tomcat] branch master updated: Fix calling service.bat from CATALINA_HOME

2020-09-29 Thread markt
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 063421f  Fix calling service.bat from CATALINA_HOME
063421f is described below

commit 063421f5f4535e4ef07c6cf1b5d7ab20af98eddf
Author: Mark Thomas 
AuthorDate: Tue Sep 29 15:16:04 2020 +0100

Fix calling service.bat from CATALINA_HOME
---
 bin/service.bat| 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/service.bat b/bin/service.bat
index b170e64..b6a2d86 100755
--- a/bin/service.bat
+++ b/bin/service.bat
@@ -75,8 +75,8 @@ rem Check the environment
 rem Guess CATALINA_HOME if not defined
 if not "%CATALINA_HOME%" == "" goto gotHome
 set "CATALINA_HOME=%cd%"
-if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto okHome
-if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto okHome
+if exist "%CATALINA_HOME%\bin\%DEFAULT_SERVICE_NAME%.exe" goto gotHome
+if exist "%CATALINA_HOME%\bin\%SERVICE_NAME%.exe" goto gotHome
 rem CD to the upper dir
 cd ..
 set "CATALINA_HOME=%cd%"
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f966a93..42032aa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,10 @@
 Don't send the Keep-Alive response header if the connection has been
 explicitly closed. (markt)
   
+  
+Fix running service.bat when called from $CATALINA_HOME.
+(markt)
+  
 
   
   


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



Re: Removing the APR connector

2020-09-29 Thread Rémy Maucherat
On Tue, Sep 29, 2020 at 1:32 PM Mark Thomas  wrote:

> All,
>
> Removing the APR connector (HTTP and AJP) is currently on the TODO list
> for Tomcat 10.0.x (i.e. the current development branch).
>
> I am wondering whether we are still happy with this plan as we have had
> a few 10.0.x milestone releases and we haven't made any efforts to
> remove the APR connector.
>
> I'm happy to remove APR from 10.0.x but I am equally happy postponing
> this to a later release if necessary.
>
> We'd still need Tomcat Native support to enable the use of OpenSSL with
> NIO and NIO2. I am only thinking of removing the APR based HTTP and AJP
> connectors (with associated plumbing) and possibly some of the
> org.apache.tomcat.jni package.
>
> Thoughts?
>

I would rather postpone at this point, with the idea of really removing it
in 10.1.
Maybe we should remove it from the docs in 10.0 in preparation for the move
?

Rémy


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


[Bug 64762] CoyoteInputStream getInputStream() read (wait after premature end and the rest comes)

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64762

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #8 from Mark Thomas  ---
Also, make sure you test against the latest 9.0.x release. There are a couple
of fixes that might relate to this since 9.0.31.

-- 
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 master updated: Update Tomcat 9 to Tomact 10

2020-09-29 Thread markt
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 6107934  Update Tomcat 9 to Tomact 10
6107934 is described below

commit 6107934e05b495110a8230c91a537ef80f9b275c
Author: Mark Thomas 
AuthorDate: Tue Sep 29 12:45:26 2020 +0100

Update Tomcat 9 to Tomact 10
---
 CONTRIBUTING.md   |  1 +
 README.md |  2 ++
 java/org/apache/tomcat/util/compat/JreCompat.java |  2 +-
 webapps/docs/architecture/project.xml |  4 ++--
 webapps/docs/changelog.xml|  5 +
 webapps/docs/config/cluster-interceptor.xml   |  2 +-
 webapps/docs/config/cluster-membership.xml| 14 ++
 webapps/docs/config/http.xml  | 20 ++--
 webapps/docs/config/listeners.xml |  6 +-
 webapps/docs/config/project.xml   |  4 ++--
 webapps/docs/rewrite.xml  |  2 +-
 11 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f0157a0..3484864 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,6 +76,7 @@ manually generate the patch file by using diff. If this is 
what you want, you
 can download the sources from the "Source Code Distributions" section of the
 Download Page. There is one such page for every major Tomcat version:
 
+- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
diff --git a/README.md b/README.md
index 9a8e002..ec1353d 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ project logo are trademarks of the Apache Software Foundation.
 For every major Tomcat version there is one download page containing
 links to the latest binary and source code downloads, but also
 links for browsing the download directories and archives:
+- [Tomcat 10](https://tomcat.apache.org/download-10.cgi)
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
@@ -42,6 +43,7 @@ The documentation available as of the date of this release is
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting  in your browser.
 The most up-to-date documentation for each version can be found at:
+- [Tomcat 10](https://tomcat.apache.org/tomcat-10.0-doc/)
 - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
 - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
 - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java 
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 099ee87..1b79e28 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -50,7 +50,7 @@ public class JreCompat {
 protected static final Method getApplicationProtocolMethod;
 
 static {
-// This is Tomcat 9 with a minimum Java version of Java 8.
+// This is Tomcat 10 with a minimum Java version of Java 8.
 // Look for the highest supported JVM first
 if (GraalCompat.isSupported()) {
 instance = new GraalCompat();
diff --git a/webapps/docs/architecture/project.xml 
b/webapps/docs/architecture/project.xml
index 7bf0c73..0589be6 100644
--- a/webapps/docs/architecture/project.xml
+++ b/webapps/docs/architecture/project.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-https://tomcat.apache.org/";>
 
-Apache Tomcat 9 Architecture
+Apache Tomcat 10 Architecture
 
 
   The Apache Tomcat Servlet/JSP Container
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8dc1aba..f966a93 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -152,6 +152,11 @@
 clarify when a user may wish to deploy additional instances of the
 Manager web application. (markt)
   
+  
+64774: Review references to Tomcat 9 in the the 
documentation
+web application and remove them or upadte them to refer to Tomact 10 as
+appropriate. (markt)
+  
 
   
   
diff --git a/webapps/docs/config/cluster-interceptor.xml 
b/webapps/docs/config/cluster-interceptor.xml
index 836c4cd..2dfc362 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -200,7 +200,7 @@
   

  The EncryptInterceptor adds encryption to the channel messages carrying
- session data between nodes

[Bug 64774] Configuration Reference pages have a wrong version number in their title

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64774

--- Comment #1 from Mark Thomas  ---
Fixed in 10.0.0-M9 onwards

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



[Bug 64774] Configuration Reference pages have a wrong version number in their title

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64774

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED
 OS||All

-- 
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: Removing the APR connector

2020-09-29 Thread Martin Grigorov
On Tue, Sep 29, 2020 at 2:31 PM Mark Thomas  wrote:

> All,
>
> Removing the APR connector (HTTP and AJP) is currently on the TODO list
> for Tomcat 10.0.x (i.e. the current development branch).
>
> I am wondering whether we are still happy with this plan as we have had
> a few 10.0.x milestone releases and we haven't made any efforts to
> remove the APR connector.
>
> I'm happy to remove APR from 10.0.x but I am equally happy postponing
> this to a later release if necessary.
>
> We'd still need Tomcat Native support to enable the use of OpenSSL with
> NIO and NIO2. I am only thinking of removing the APR based HTTP and AJP
> connectors (with associated plumbing) and possibly some of the
> org.apache.tomcat.jni package.
>
> Thoughts?
>

+1 to remove!


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


Removing the APR connector

2020-09-29 Thread Mark Thomas
All,

Removing the APR connector (HTTP and AJP) is currently on the TODO list
for Tomcat 10.0.x (i.e. the current development branch).

I am wondering whether we are still happy with this plan as we have had
a few 10.0.x milestone releases and we haven't made any efforts to
remove the APR connector.

I'm happy to remove APR from 10.0.x but I am equally happy postponing
this to a later release if necessary.

We'd still need Tomcat Native support to enable the use of OpenSSL with
NIO and NIO2. I am only thinking of removing the APR based HTTP and AJP
connectors (with associated plumbing) and possibly some of the
org.apache.tomcat.jni package.

Thoughts?

Mark

-
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: Allow a tets to complete more quickly

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new db02956  Allow a tets to complete more quickly
db02956 is described below

commit db029561ba55bc13b59b3af440037235d72358d8
Author: Mark Thomas 
AuthorDate: Tue Sep 29 11:11:23 2020 +0100

Allow a tets to complete more quickly
---
 test/org/apache/coyote/http11/TestHttp11Processor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index ce4892e..59b3457 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -582,6 +582,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
 client.setRequest(new String[] {request});
+client.setUseContentLength(true);
 
 client.connect();
 client.processRequest();


-
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: Allow a tets to complete more quickly

2020-09-29 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 405a191  Allow a tets to complete more quickly
405a191 is described below

commit 405a1916a145b372cc1c9d7cbd237a0d534e1917
Author: Mark Thomas 
AuthorDate: Tue Sep 29 11:11:23 2020 +0100

Allow a tets to complete more quickly
---
 test/org/apache/coyote/http11/TestHttp11Processor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 48a843b..58fc3b2 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -586,6 +586,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
 client.setRequest(new String[] {request});
+client.setUseContentLength(true);
 
 client.connect();
 client.processRequest();


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



[tomcat] branch master updated: Allow a tets to complete more quickly

2020-09-29 Thread markt
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 4a27c3f  Allow a tets to complete more quickly
4a27c3f is described below

commit 4a27c3ff0460c7f9ff16ea49ffe0c20790d8576f
Author: Mark Thomas 
AuthorDate: Tue Sep 29 11:11:23 2020 +0100

Allow a tets to complete more quickly
---
 test/org/apache/coyote/http11/TestHttp11Processor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java 
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 346f264..2d693ae 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -582,6 +582,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
 
 Client client = new Client(tomcat.getConnector().getLocalPort());
 client.setRequest(new String[] {request});
+client.setUseContentLength(true);
 
 client.connect();
 client.processRequest();


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



[GitHub] [tomcat] blueSky1825821 removed a comment on pull request #368: fix: CachedResource add path length

2020-09-29 Thread GitBox


blueSky1825821 removed a comment on pull request #368:
URL: https://github.com/apache/tomcat/pull/368#issuecomment-700584396


   > What is the justification for this change? What problem does it solve?
   
   When our application is loaded in another path or attacked in an unknown 
way, webapp path could take up a lot of space.
   org.apache.catalina.webresources.Cache#resourceCache can't be cleaned up, 
this happens in a production environment



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



[GitHub] [tomcat] blueSky1825821 commented on pull request #368: fix: CachedResource add path length

2020-09-29 Thread GitBox


blueSky1825821 commented on pull request #368:
URL: https://github.com/apache/tomcat/pull/368#issuecomment-700585098


   > > What is the justification for this change? What problem does it solve?
   > 
   > When our application is loaded in another path or attacked in an unknown 
way, webapp path could take up a lot of space(a few megabytes).
   > org.apache.catalina.webresources.Cache#resourceCache can't be cleaned up, 
this happens in a production environment
   
   
   



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



[GitHub] [tomcat] blueSky1825821 commented on pull request #368: fix: CachedResource add path length

2020-09-29 Thread GitBox


blueSky1825821 commented on pull request #368:
URL: https://github.com/apache/tomcat/pull/368#issuecomment-700584396


   > What is the justification for this change? What problem does it solve?
   
   When our application is loaded in another path or attacked in an unknown 
way, webapp path could take up a lot of space.
   org.apache.catalina.webresources.Cache#resourceCache can't be cleaned up, 
this happens in a production environment



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



[GitHub] [tomcat] markt-asf commented on pull request #368: fix: CachedResource add path length

2020-09-29 Thread GitBox


markt-asf commented on pull request #368:
URL: https://github.com/apache/tomcat/pull/368#issuecomment-700577634


   What is the justification for this change? What problem does it solve?



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



[GitHub] [tomcat] blueSky1825821 opened a new pull request #368: fix: CachedResource add path length

2020-09-29 Thread GitBox


blueSky1825821 opened a new pull request #368:
URL: https://github.com/apache/tomcat/pull/368


   cachedResource should add webapp path length



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



[Bug 64765] ThreadPoolExecutor#submittedCount wrong after undeploy

2020-09-29 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64765

avand...@gmail.com changed:

   What|Removed |Added

 CC||avand...@gmail.com

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



Re: ApacheCon @ Home Tomcat Track Schedule

2020-09-29 Thread Martin Grigorov
Hi,

A friendly reminder: the conference already started and the Tomcat sessions
will start in less than 6 hours from now!

On Fri, Aug 14, 2020 at 6:49 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> All,
>
> I'm happy to announce that the Apache Tomcat track schedule has been
> posted for ApacheCon @ Home, our virtual conference to replace
> "ApacheCon North America 2020". If you use social media to discuss
> this event, please use #ACAH2020 and tag @apachecon.
>
> You can find the schedule here, as well as links to the other 27 (!)
> tracks that will be held at the conference:
> https://www.apachecon.com/acah2020/tracks/tomcat.html
>
> If you'd like to register (zero cost!), you can do that here:
> https://hopin.to/events/apachecon-home
>
> Note that some tracks are happening at different times; please check
> the times for each presentation in each track for your timezone.
>
> I hope to "see" many of you at the conference this year.
>
> Thanks,
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl82sk4ACgkQHPApP6U8
> pFiypw/+M6Sz1wUtXk6A1CO5Lbz0jMU6/Ky53+zCb3skp4wNSVXaUuJ4xCb2hWg/
> cl8KkgP6N0e4stwB9M/XbL403Ic6NGYBvS2ZcMmm2rJqO99t5UvTpUY/DzzNwaXf
> d5z2h8p+aSU4ph6UZavi/Tydxa83WxQSRDuRww61xs6yHv7myELicv+fATJGY4fb
> slMLJt2Hzmh9C7t7+xkQDTpEUNz+oIV2yyQwuvkAS6WMHJbrqAkuqgQq6eAYm5Qc
> 79pb4e/G+E71Sr2AzeuFSpLQCUzYIyOkXFoLfr9L6Wb7iwwiu5bFP7+WAbJvI200
> tYjokn9NdZOwf4P3uY0xfCk3aq2jI9DZAcYjh7n0nhHCN+8vrqodQ/CZtoBYNQR5
> /HwMgszCyimfkegwb3CcuayFUko/Oa+klSOuh9XqFM8jb9XobyXx7dprZk3Ly0Kq
> oL/7h3+uBvz4rzR6FVdcuJ7stY4JpBhG+ZsjkiMktYcZovD9IP20RIE+omvqc0/S
> L1d/3XyRk3fM6JuQq2Y9yqTcgsbBrzEtcwIAOv2r9TQaRrwSbO2nTUiPVx8RTwQ4
> dtE60qVUvZ933I8aV4akqGkeUSBbxiv0WSfpV3T2F1latoqfEmlzueJNWrdgwXFC
> 8hSVyx29AsTiDGAXAswzxQDyNFlaY9zZZKi467doMvhJBGzTYfk=
> =pleB
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: users-h...@tomcat.apache.org
>
>