Re: [tomcat] branch 10.1.x updated: Update objenesis and unboundid versions for IDE configs. Submitted by Bailey Brownie

2023-02-09 Thread Han Li



> On Feb 9, 2023, at 16:36, li...@apache.org wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> lihan pushed a commit to branch 10.1.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/10.1.x by this push:
> new 760961a1a7 Update objenesis and unboundid versions for IDE configs. 
> Submitted by Bailey Brownie
> 760961a1a7 is described below
> 
> commit 760961a1a772417307714b447a17a0cfad912a36
> Author: Bailey Brownie 
> AuthorDate: Mon Feb 6 21:39:39 2023 -0500
> 
>Update objenesis and unboundid versions for IDE configs.
>Submitted by Bailey Brownie

Sorry, this is not written correctly.

Han
> ---
> build.xml  | 37 +-
> res/ide-support/eclipse/eclipse.classpath  | 24 +++---
> .../eclipse/org.eclipse.jdt.core.prefs.properties  |  6 ++--
> res/ide-support/idea/misc.xml  |  2 +-
> res/ide-support/idea/tomcat.iml| 24 +++---
> .../netbeans/nb-tomcat-build.properties|  2 +-
> res/ide-support/netbeans/nb-tomcat.xml |  2 +-
> res/ide-support/netbeans/project.xml   | 16 +-
> webapps/docs/building.xml  | 13 
> 9 files changed, 67 insertions(+), 59 deletions(-)
> 
> diff --git a/build.xml b/build.xml
> index 61a9f86c09..8051b42a85 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -246,6 +246,22 @@
> 
>   
> 
> +  
> +  
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +  
> +
>   
>   
> 
> @@ -3793,11 +3809,16 @@ asf.ldap.username=${release.asfusername}
> 
> 
>  tofile="${tomcat.home}/.project"/>
> - tofile="${tomcat.home}/.classpath"/>
> + tofile="${tomcat.home}/.classpath">
> +  
> +  
> +
> 
> 
> -
> - file="${tomcat.home}/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties"
>  tofile="${tomcat.home}/.settings/org.eclipse.jdt.core.prefs"/>
> +
> + file="${tomcat.home}/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties"
>  tofile="${tomcat.home}/.settings/org.eclipse.jdt.core.prefs">
> +  
> +
> 
> Eclipse project files created.
> Read the Building page on the Apache Tomcat documentation site for details on 
> how to configure your Eclipse workspace.
> @@ -3811,13 +3832,11 @@ Read the Building page on the Apache Tomcat 
> documentation site for details on ho
> 
> 
>   
> +  
> +  
> 
> 
> -IntelliJ IDEA project directory created. Please create PATH 
> VARIABLES for
> -
> -  ANT_HOME  = ${ant.home}
> -  TOMCAT_BUILD_LIBS = ${base.path}
> -
> +IntelliJ IDEA project directory created.
>   
> 
>   
> @@ -3853,6 +3872,8 @@ Use the "ide-netbeans-replace" target if you wish to 
> overwrite them.
> 
> 
>   
> +  
> +  
> 
> NetBeans project files created.
> Read the Building page on the Apache Tomcat documentation site for details on 
> how to customise your NetBeans project.
> diff --git a/res/ide-support/eclipse/eclipse.classpath 
> b/res/ide-support/eclipse/eclipse.classpath
> index 850b7e1acf..fcad3f3747 100644
> --- a/res/ide-support/eclipse/eclipse.classpath
> +++ b/res/ide-support/eclipse/eclipse.classpath
> @@ -19,18 +19,18 @@
> 
>  kind="src" path="test"/>
> 
> - path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
> + path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-@BUILD_JAVA_VERSION@"/>
>  path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
> -
> - path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
> - path="TOMCAT_LIBS_BASE/wsdl4j-1.6.3/wsdl4j-1.6.3.jar"/>
> - path="TOMCAT_LIBS_BASE/ecj-4.26/ecj-4.26.jar"/>
> - path="TOMCAT_LIBS_BASE/easymock-4.3/easymock-4.3.jar"/>
> - 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.3/objenesis-3.3.jar"/>
> - path="TOMCAT_LIBS_BASE/bnd-6.4.0/biz.aQute.bnd-6.4.0.jar"/>
> - path="TOMCAT_LIBS_BASE/migration-1.0.6/jakartaee-migration-1.0.6-shaded.jar"/>
> - path="TOMCAT_LIBS_BASE/unboundid-6.0.7/unboundid-ldapsdk-6.0.7.jar"/>
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> +
> 
> 
> diff --git a/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties 
> b/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
> index c7fcfab4bb..0e28ec4353 100644
> --- a/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
> +++ b/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
> @@ -15,6 +15,6 @@
> # limitations under the License.
> # 
> ---

Re: [tomcat] branch 10.1.x updated: Revert TestAsyncContextImpl.

2023-02-10 Thread Han Li



> On Feb 10, 2023, at 17:24, li...@apache.org wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> lihan pushed a commit to branch 10.1.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/10.1.x by this push:
> new 5bff34bfec Revert TestAsyncContextImpl.
> 5bff34bfec is described below
> 
> commit 5bff34bfec80a38de933171c36c9b5691bfbbe82
> Author: lihan 
> AuthorDate: Fri Feb 10 17:24:03 2023 +0800
> 
>Revert TestAsyncContextImpl.
> ---
> test/org/apache/catalina/core/TestAsyncContextImpl.java | 13 +
> 1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
> b/test/org/apache/catalina/core/TestAsyncContextImpl.java
> index fc755166b2..14621803ed 100644
> --- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
> +++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
> @@ -1521,10 +1521,15 @@ public class TestAsyncContextImpl extends 
> TomcatBaseTest {
> // Just for debugging
> async.setTimeout(10);
> 
> -try (ExecutorService executor = 
> Executors.newSingleThreadExecutor()) {
> -executor.submit(() -> async.dispatch("/ServletC"));
> -executor.shutdown();
> -}

This way of writing is only possible on JDK 19 onward, which I did not notice.

Han

> +ExecutorService executor = Executors.newSingleThreadExecutor();
> +executor.submit(new Runnable() {
> +
> +@Override
> +public void run() {
> +async.dispatch("/ServletC");
> +}
> +});
> +executor.shutdown();
> }
> }
> 
> 
> 
> -
> 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: [tomcat] branch main updated: Many improvements.

2023-02-17 Thread Han Li


> On Feb 17, 2023, at 17:17, Rémy Maucherat  wrote:
> 
> On Fri, Feb 17, 2023 at 4:32 AM  wrote:
>> -ciphers.removeAll(movedCiphers);
>> +movedCiphers.forEach(ciphers::remove);
> 
> Ok for some of them maybe, but I don't understand why one this is better.

See:https://www.baeldung.com/java-hashset-removeall-performance 

It’s just possible to avoid some potential performance issues. So i replaced 
old writing style with this. :)

Han
> Rémy
> 
>> ciphers.addAll(movedCiphers);
>> }
>> 
>> @@ -582,7 +582,7 @@ public class OpenSSLCipherConfigurationParser {
>> }
>> 
>> static void remove(final Set ciphers, final String alias) {
>> -ciphers.removeAll(aliases.get(alias));
>> +aliases.get(alias).forEach(ciphers::remove);
>> }
>> 
>> static LinkedHashSet strengthSort(final LinkedHashSet 
>> ciphers) {
>> diff --git a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java 
>> b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
>> index 148f57ab58..fa685ba81d 100644
>> --- a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
>> +++ b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
>> @@ -67,9 +67,9 @@ public abstract class AbstractInputStreamJar implements 
>> Jar {
>> // Skip base entries where there is a multi-release entry
>> // Skip multi-release entries that are not being used
>> while (entry != null &&
>> -(mrMap.keySet().contains(entry.getName()) ||
>> +(mrMap.containsKey(entry.getName()) ||
>> 
>> entry.getName().startsWith("META-INF/versions/") &&
>> -!mrMap.values().contains(entry.getName( 
>> {
>> +!mrMap.containsValue(entry.getName( {
>> entry = jarInputStream.getNextJarEntry();
>> }
>> } else {
>> diff --git a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java 
>> b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
>> index f6b94ef71c..2036af9f2a 100644
>> --- a/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
>> +++ b/java/org/apache/tomcat/util/xreflection/ReflectionProperty.java
>> @@ -116,11 +116,9 @@ final class ReflectionProperty implements 
>> Comparable {
>> 
>> @Override
>> public String toString() {
>> -final StringBuffer sb = new StringBuffer("ReflectionProperty{");
>> -sb.append("name='").append(propertyName).append('\'');
>> -sb.append(", type=").append(propertyType);
>> -sb.append('}');
>> -return sb.toString();
>> +return "ReflectionProperty{" + "name='" + propertyName + '\'' +
>> +", type=" + propertyType +
>> +'}';
>> }
>> 
>> @Override
>> diff --git a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java 
>> b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
>> index a0a0146048..2011510432 100644
>> --- a/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
>> +++ b/java/org/apache/tomcat/util/xreflection/SetPropertyClass.java
>> @@ -118,10 +118,8 @@ final class SetPropertyClass implements 
>> Comparable {
>> 
>> @Override
>> public String toString() {
>> -final StringBuffer sb = new StringBuffer("SetPropertyClass{");
>> -sb.append("clazz=").append(clazz.getName());
>> -sb.append('}');
>> -return sb.toString();
>> +return "SetPropertyClass{" + "clazz=" + clazz.getName() +
>> +'}';
>> }
>> 
>> public void addProperty(ReflectionProperty property) {
>> 
>> 
>> -
>> 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: [VOTE] Release Apache Tomcat 11.0.0-M3

2023-02-19 Thread Han Li



> On Feb 18, 2023, at 02:18, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M3 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M3 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M3/
> 8afe2647d7801172cc304f4a47d8aad9646d2985
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1417
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M3
> 
> 
> The proposed 11.0.0-M3 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 11.0.0-M3

Test pass.

Han

> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.6

2023-02-19 Thread Han Li



> On Feb 19, 2023, at 22:11, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.6 release is now available for
> voting.
> 
> The notable changes compared to 10.1.5 are:
> 
> - Switch to using the ServiceLoader mechanism to load the custom URL
>  protocol handlers that Tomcat uses.
> 
> - Update the packaged version of the Apache Tomcat Native Library to
>  2.0.3 to pick up the Windows binaries built with with OpenSSL 3.0.8.
> 
> - Add the shared address space specified by RFC 6598 (100.64.0.0/10)
>  to the list of trusted proxies for RemoteIPValve/Filter.
> 
> - Limit access to examples web application to localhost by default
> 
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.6/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1421
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.6
> 9829c929059f96605a3fb870700b5887970d7203
> 
> The proposed 10.1.6 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 10.1.6

Test pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.72

2023-02-21 Thread Han Li



> On Feb 18, 2023, at 17:44, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.72 release is now available for voting.
> 
> The notable changes compared to 9.0.71 are:
> 
> -  Add an error report valve that allows redirecting to or proxying from an
>   external web server.
> 
> - Log basic information for each configured TLS certificate when
>   Tomcat starts.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.72/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1418
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.72
> 7754d319b2a8866b5bcdf1ea0f35e68470320295
> 
> The proposed 9.0.72 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 9.0.72

Han
> 
> Rémy
> 
> -
> 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: [tomcat] branch main updated: Replace with JDK 1.8 Integer::compareUnsigned(int, int).

2023-02-26 Thread Han Li


> On Feb 27, 2023, at 01:38, Mark Thomas  wrote:
> 
> On 26/02/2023 07:46, li...@apache.org  wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>> lihan pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> The following commit(s) were added to refs/heads/main by this push:
>> new f459e9686e Replace with JDK 1.8 Integer::compareUnsigned(int, int).
>> f459e9686e is described below
>> commit f459e9686ebe2703379cdf4f182010f94f312b62
>> Author: lihan 
>> AuthorDate: Sun Feb 26 15:11:17 2023 +0800
>> Replace with JDK 1.8 Integer::compareUnsigned(int, int).
>> ---
>> .../apache/tomcat/util/codec/binary/BaseNCodec.java | 21 
>> ++---
> 
> This is code forked from Commons Codec. Ideally, we should keep this as close 
> to the Commons code as possible.
Oops, thanks for the reminder.

> 
> No need to revert this. Commons Codec doesn't change that often and one more 
> difference doesn't add much overhead to the update process.
Ok. :)

Han
> 
> 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 11.0.0-M4

2023-02-27 Thread Han Li



> On Feb 28, 2023, at 04:32, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M4 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M4 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Revert the switch to using the ServiceLoader mechanism to load the
>  custom URL protocol handlers that Tomcat uses. The original system
>  property based approach has been restored.
> 
> - Provide an implementation of the sub-set of JavaBeans support that
>  does not depend on the java.beans package. This for use by Expression
>  Language when the java.desktop module (which is where the java.beans
>  package resides) is not available.
> 
> - Restore inline state after async operation in NIO2, to account the
>  fact that unexpected exceptions are sometimes thrown by the
>  implementation. Patch submitted by zhougang.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M4/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1425
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M4
> 3b6de549bdf4f6486c39daa0ae8e4d4b7475b1f6
> 
> 
> The proposed 11.0.0-M4 release is:
> [ ] Broken - do not release
> [X] Alpha  - go ahead and release as 11.0.0-M4

Test pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.7

2023-02-28 Thread Han Li



> On Feb 28, 2023, at 04:56, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.7 release is now available for
> voting.
> 
> The notable changes compared to 10.1.6 are:
> 
> - Revert the switch to using the ServiceLoader mechanism to load the
>   custom URL protocol handlers that Tomcat uses. The original system
>   property based approach has been restored.
> 
> - Restore inline state after async operation in NIO2, to account the
>   fact that unexpected exceptions are sometimes thrown by the
>   implementation. Patch submitted by zhougang.
> 
> - Provide a more appropriate response (501 rather than 400) when
>   rejecting an HTTP request using the CONNECT method.
> 
> - Add support for txt: and rnd: rewrite map types from mod_rewrite.
>   Based on a pull request provided by Dimitrios Soumis.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.7/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1426
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.7
> 473ef42c637c97eb17b38c5580a6b854dfe27a02
> 
> The proposed 10.1.7 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 10.1.7

Test pass.

Han
> 
> -
> 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: [tomcat] branch main updated: Align with spec

2023-03-06 Thread Han Li


> On Mar 7, 2023, at 14:39, Konstantin Kolinko  wrote:
> 
> вт, 7 мар. 2023 г. в 09:17, mailto:li...@apache.org>>:
>> 
>> This is an automated email from the ASF dual-hosted git repository.
>> 
>> lihan pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> 
>> 
>> The following commit(s) were added to refs/heads/main by this push:
>> new 1fc4b7c95d Align with spec
>> 1fc4b7c95d is described below
>> 
>> commit 1fc4b7c95dce1db3d86db9393c78023b93725f63
>> Author: lihan 
>> AuthorDate: Tue Mar 7 14:16:53 2023 +0800
>> 
>> Align with spec
> 
> -1 (veto)
> 
> Please revert.
Ok.
> 
> The text of the specification comes with a license.
> 
> I have not checked recently (with the spec is managed by Eclipse
> Foundation), but in earlier times (for specs copyrighted by Oracle) it
> was clear that you were not allowed to copy their text as you wish.
> 
> You are not the first one to make such changes. There were similar
> discussions in earlier years.

I probably understand what means, and I have another question that if I just 
align code with spec there’s no problem, right?

Han
> 
> Best regards,
> Konstantin Kolinko
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> 
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> 


Re: [tomcat] branch main updated: Align with spec

2023-03-06 Thread Han Li



> On Mar 7, 2023, at 15:51, Rémy Maucherat  wrote:
> 
> On Tue, Mar 7, 2023 at 8:14 AM Han Li  wrote:
>> 
>> 
>> 
>>> On Mar 7, 2023, at 14:39, Konstantin Kolinko  wrote:
>>> 
>>> вт, 7 мар. 2023 г. в 09:17, mailto:li...@apache.org>>:
>>>> 
>>>> This is an automated email from the ASF dual-hosted git repository.
>>>> 
>>>> lihan pushed a commit to branch main
>>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>>> 
>>>> 
>>>> The following commit(s) were added to refs/heads/main by this push:
>>>> new 1fc4b7c95d Align with spec
>>>> 1fc4b7c95d is described below
>>>> 
>>>> commit 1fc4b7c95dce1db3d86db9393c78023b93725f63
>>>> Author: lihan 
>>>> AuthorDate: Tue Mar 7 14:16:53 2023 +0800
>>>> 
>>>> Align with spec
>>> 
>>> -1 (veto)
>>> 
>>> Please revert.
>> Ok.
>>> 
>>> The text of the specification comes with a license.
>>> 
>>> I have not checked recently (with the spec is managed by Eclipse
>>> Foundation), but in earlier times (for specs copyrighted by Oracle) it
>>> was clear that you were not allowed to copy their text as you wish.
>>> 
>>> You are not the first one to make such changes. There were similar
>>> discussions in earlier years.
>> 
>> I probably understand what means, and I have another question that if I just 
>> align code with spec there’s no problem, right?
> 
> No problem (obviously).

Ok, Thanks!

Han
> 
> Rémy
> 
>> Han
>>> 
>>> Best regards,
>>> Konstantin Kolinko
>>> 
>>> -
>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
>>> <mailto:dev-unsubscr...@tomcat.apache.org>
>>> For additional commands, e-mail: dev-h...@tomcat.apache.org 
>>> <mailto: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: [tomcat] branch main updated: Align with spec

2023-03-07 Thread Han Li
Hi Mark,Remy and Konstatntin,

Thank you for such detailed answers, I read all your reply in full. I read, and 
the reason for this commit is because of user feedback about a bug, see below:
https://github.com/apache/tomcat/pull/595 
<https://github.com/apache/tomcat/pull/595>

And then I found that it was inconsistent with the spec, in my realize, the 
Jakarta package in the tomcat project should be aligned with the spec (which is 
obviously wrong so far),
So I just simply copied and pasted it and committed it.

According to the reply, I found that I just need to follow the PR’s change to 
submit without doing anything extra.


Thanks 

Han

> On Mar 7, 2023, at 16:06, Rémy Maucherat  wrote:
> 
> On Tue, Mar 7, 2023 at 8:55 AM Konstantin Kolinko
> mailto:knst.koli...@gmail.com>> wrote:
>> 
>> вт, 7 мар. 2023 г. в 10:14, Han Li :
>>> 
>>> 
>>> 
>>>> On Mar 7, 2023, at 14:39, Konstantin Kolinko  
>>>> wrote:
>>>> 
>>>> вт, 7 мар. 2023 г. в 09:17, mailto:li...@apache.org>>:
>>>>> 
>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>> 
>>>>> lihan pushed a commit to branch main
>>>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>>>> 
>>>>> 
>>>>> The following commit(s) were added to refs/heads/main by this push:
>>>>> new 1fc4b7c95d Align with spec
>>>>> 1fc4b7c95d is described below
>>>>> 
>>>>> commit 1fc4b7c95dce1db3d86db9393c78023b93725f63
>>>>> Author: lihan 
>>>>> AuthorDate: Tue Mar 7 14:16:53 2023 +0800
>>>>> 
>>>>> Align with spec
>>>> 
>>>> -1 (veto)
>>>> 
>>>> Please revert.
>>> Ok.
>>>> 
>>>> The text of the specification comes with a license.
>>>> 
>>>> I have not checked recently (with the spec is managed by Eclipse
>>>> Foundation), but in earlier times (for specs copyrighted by Oracle) it
>>>> was clear that you were not allowed to copy their text as you wish.
>>>> 
>>>> You are not the first one to make such changes. There were similar
>>>> discussions in earlier years.
>>> 
>>> I probably understand what means, and I have another question that if I 
>>> just align code with spec there’s no problem, right?
>>> 
>> 
>> Regarding javadoc,
>> I think it is OK to document what Tomcat does. (What it has to do is
>> dictated by the spec, but what it actually does is our implementation
>> details, and can be documented).
>> 
>> Regarding code,
>> If you are talking about alignment of method signatures, those should
>> already have been aligned. I know that the TCK (i.e. the set of tests
>> that comes with specification) has tests that check signatures of all
>> methods. As Tomcat was tested with TCK some time ago, I think those
>> methods have already been tested.
>> 
>> If you are talking about alignment of implementation details,
>> there is no reason to do so,
> 
> Yes, that's a good clarification. Code should be added (without cut &
> pasting ;) ) so that there are no behavior differences. In this
> particular commit, there's no behavior change, so no need to fix
> anything.
> 
> Rémy
> 
>> The specification is just a document (pdf) plus javadoc (and method
>> signatures documented there), and a set of tests (TCK). If you are
>> looking at the code that comes with the spec, that code is just a
>> "reference implementation", serves as an example and does not define
>> any required behaviour.
>> 
>> If there is a bug, i.e. behaviour of Tomcat differs with that is
>> dictated by official javadoc, it is a bug, and should be fixed as
>> such.
>> 
>> 
>> Best regards,
>> Konstantin Kolinko
>> 
>> -
>> 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 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [tomcat] branch main updated: Fix BZ 66507 - Catalina version command not honoring JAVA_OPTS variable

2023-03-07 Thread Han Li



> On Mar 7, 2023, at 16:07, Mark Thomas  wrote:
> 
> On 07/03/2023 03:39, li...@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>> lihan pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> The following commit(s) were added to refs/heads/main by this push:
>>  new 2ee1135c46 Fix BZ 66507 - Catalina version command not honoring 
>> JAVA_OPTS variable
>> 2ee1135c46 is described below
>> commit 2ee1135c46654ff366b50077ef0bce7090666dfa
>> Author: lihan 
>> AuthorDate: Tue Mar 7 11:38:51 2023 +0800
>> Fix BZ 66507 - Catalina version command not honoring JAVA_OPTS variable
>>  Patch suggested by Eric Hamilton
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=66507
> 
> This needs a changelog entry.

Done.

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



Re: PersistentManager, PersistentValve, and DataSource/JDBCStore can cause PK violations

2023-03-07 Thread Han Li


> On Mar 8, 2023, at 07:29, Christopher Schultz  
> wrote:
> 
> All,
> 
> Please see https://bz.apache.org/bugzilla/show_bug.cgi?id=66513 for reference.
> 
> It appears that the synchronization used by the PersistentManager can cause 
> problems when used with the PersistentValve and DataSource/JDBCStore.
> 
> The problem is that PersistentManager assumes that the Session object can be 
> used as a synchronization monitor to load/update the session in the Store. 
> The DataSource/JDBCStore implementation uses an INSERT to create a new 
> session, and a DELETE-then-INSERT to re-write the session data in the db.
> 
> When two requests arrive simultaneously, thread scheduling can cause 
> DELETE-then-DELETE-then-INSERT-then-INSERT which causes a duplicate PK 
> violation.
> 
> If the PersistentValve were not in use, the in-memory Session would be 
> stable. PersistentValve re-loads the Session from the Store on ever request, 
> rendering the PersistentManager's synchronized(session) attempt to protect 
> things useless.
> 
> I think a simple way to fix this might be to change:
> 
> // PersistentManager.java:478~
>if(session != null) {
>synchronized(session){
>session = super.findSession(session.getIdInternal());
>if(session != null){
>   // To keep any external calling code from messing up the
>   // concurrency.
>   session.access();
>   session.endAccess();
>}
>}
>}
> 
> to this:
> 
>if(session != null) {
>sessionId = String.intern(sessionId);
>synchronized(sessionId){
>session = super.findSession(session.getIdInternal());
>if(session != null){
>   // To keep any external calling code from messing up the
>   // concurrency.
>   session.access();
>   session.endAccess();
>}
>}
>}
> 
> This swaps the Session object for the sessionId as the synchronization 
> monitor. We use String.intern to ensure that we always have the same exact 
> object, even across sessions, request, etc.
-1

This method does seem very simple and solves this problem, but it’s not as good 
as you might think, see below:
https://shipilev.net/jvm/anatomy-quarks/10-string-intern/ 


So I don’t think it should be the preferred option.

Han

> 
> This is *a* way to solve this problem. There are other ways.
> 
> Another way is also a TODO in the DataSourceRealm code which suggests using 
> UPDATE for sessions that already exist. That is probably worth implementing, 
> and it would fix this particular issue.
> 
> Note that it is essentially impossible to prevent thread scheduling, requests 
> to other members of the cluster, etc. to prevent data-loss from the session 
> and this BZ isn't asking us to fix that. It's only asking that a single 
> Tomcat node with PersistentValve enabled doesn't cause thee duplicate PK 
> violations for some pretty basic usages.
> 
> -chris
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 



Re: Double-wrapping of byte-array in streams in DataSourceStore.java

2023-03-09 Thread Han Li



> On Mar 9, 2023, at 22:52, Christopher Schultz  
> wrote:
> 
> All,
> 
> Please have a look at DataSourceStore.java:629
> 
> https://github.com/apache/tomcat/blob/main/java/org/apache/catalina/session/DataSourceStore.java#L629
> 
> It looks to be like the byte array which contains the session data is being 
> first wrapped in a ByteArrayInputStream (which is necessary to robustly 
> supply the data to the JDBC driver), and then again in a BufferedInputStream.
> 
> I don't see a need for this second wrapper. IMO it just adds overhead because 
> the underlying data is just byte[]. Copying that data to another buffer 
> doesn't improve anything.
> 
> I'd like to remove this additional wrapper unless someone can provide a 
> justification for the double-wrapping.
+1

Indeed, It doesn’t seem to improve anything.

> 
> Thanks,
> -chris
> 
> -
> 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: [tomcat] branch main updated: Support RFC 7616. Add support for multiple algorithms.

2023-03-14 Thread Han Li



> On Mar 15, 2023, at 01:45, ma...@apache.org wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new 55ad7dbe19 Support RFC 7616. Add support for multiple algorithms.
> 55ad7dbe19 is described below
> 
> commit 55ad7dbe196ba35dd16952701890d318e7926c02
> Author: Mark Thomas 
> AuthorDate: Fri Mar 3 17:58:05 2023 +
> 
>Support RFC 7616. Add support for multiple algorithms.
> ---
> java/org/apache/catalina/Realm.java|  40 +++
> .../authenticator/DigestAuthenticator.java | 213 
> .../catalina/authenticator/LocalStrings.properties |   2 +
> java/org/apache/catalina/realm/CombinedRealm.java  |   4 +-
> .../apache/catalina/realm/JAASCallbackHandler.java |   7 +-
> .../catalina/realm/JAASMemoryLoginModule.java  |   9 +-
> java/org/apache/catalina/realm/JAASRealm.java  |   6 +-
> java/org/apache/catalina/realm/JNDIRealm.java  |   4 +-
> .../apache/catalina/realm/LocalStrings.properties  |   1 +
> java/org/apache/catalina/realm/LockOutRealm.java   |   4 +-
> java/org/apache/catalina/realm/RealmBase.java  |  48 +++-
> .../tomcat/websocket/DigestAuthenticator.java  |  22 +-
> .../TestDigestAuthenticatorAlgorithms.java | 279 +
> test/org/apache/catalina/realm/TestJNDIRealm.java  |   6 +-
> webapps/docs/changelog.xml |   6 +
> webapps/docs/config/valve.xml  |   7 +
> 16 files changed, 580 insertions(+), 78 deletions(-)
> 
> diff --git a/java/org/apache/catalina/Realm.java 
> b/java/org/apache/catalina/Realm.java
> index cb27fdd487..e81802965e 100644
> --- a/java/org/apache/catalina/Realm.java
> +++ b/java/org/apache/catalina/Realm.java
> @@ -101,13 +101,53 @@ public interface Realm extends Contained {
>  * @param digestA2 Second digest calculated as digest(Method + ":" + uri)
>  *
>  * @return the associated principal, or {@code null} if there is none.
> + *
> + * @deprecated Unused. Use {@link #authenticate(String, String, String,
> + * String, String, String, String, String, String)}. Will be removed in
> + * Tomcat 11.
>  */
> +@Deprecated
> Principal authenticate(String username, String digest,
>   String nonce, String nc, String cnonce,
>   String qop, String realm,
>   String digestA2);
> 
> 
> +/**
> + * Try to authenticate with the specified username, which
> + * matches the digest calculated using the given parameters using the
> + * method described in RFC 7616.
> + * 
> + * The default implementation calls {@link #authenticate(String, String,
> + * String, String, String, String, String, String)} for backwards
> + * compatibility which effectively forces the use of MD5 regardless of 
> the
> + * algorithm specified in the call to this method.
> + * 
> + * Implementations are expected to override the default implementation 
> and
> + * take account of the algorithm parameter.
> + *
> + * @param username Username of the Principal to look up
> + * @param digest Digest which has been submitted by the client
> + * @param nonce Unique (or supposedly unique) token which has been used
> + * for this request
> + * @param nc the nonce counter
> + * @param cnonce the client chosen nonce
> + * @param qop the "quality of protection" ({@code nc} and {@code cnonce}
> + *will only be used, if {@code qop} is not {@code null}).
> + * @param realm Realm name
> + * @param digestA2 Second digest calculated as digest(Method + ":" + uri)
> + * @param algorithm The message digest algorithm to use
> + *
> + * @return the associated principal, or {@code null} if there is none.
> + */
> +default Principal authenticate(String username, String digest,
> +  String nonce, String nc, String cnonce,
> +  String qop, String realm,
> +  String digestA2, String algorithm) {
> +return authenticate(username, digest, nonce, nc, cnonce, qop, realm, 
> digestA2);
> +}
> +
> +
> /**
>  * Try to authenticate using a {@link GSSContext}.
>  *
> diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
> b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
> index 0d5e681a3f..f80f2181e9 100644
> --- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
> +++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
> @@ -19,8 +19,14 @@ package org.apache.catalina.authenticator;
> import java.io.IOException;
> import java.io.StringReader;
> import java.nio.charset.StandardCharsets;

Re: [VOTE] Release Apache Tomcat 11.0.0-M5

2023-04-12 Thread Han Li



> On Apr 13, 2023, at 07:20, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M5 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M5 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Reduce the default value of maxParameterCount from 10,000 to 1,000.
> 
> - Correct a regression in the fix for bug 66442 that meant that streams
>  without a response body did not decrement the active stream count
>  when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some
>  connections.
> 
> - Expand the validation of the value of the Sec-Websocket-Key header in
>  the HTTP upgrade request that initiates a WebSocket connection. The
>  value is not decoded but it is checked for the correct length and that
>  only valid characters from the base64 alphabet are used.
> 
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M5/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1427
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M5
> 06977fbea3c82c3d29e544203983dd3b49a632f1
> 
> 
> The proposed 11.0.0-M5 release is:
> [ ] Broken - do not release
> [ X] Alpha  - go ahead and release as 11.0.0-M5

Tests pass with tc-native2.0.2 and OpenSSL3.0.7 on macOS 12.3.1

Han


> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.74

2023-04-13 Thread Han Li



> On Apr 13, 2023, at 16:42, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.74 release is now available for voting.
> 
> The notable changes compared to 9.0.73 are:
> 
> - Reduce the default value of maxParameterCount from 10,000 to 1,000.
> 
> - Correct a regression in the fix for bug 66442 that meant that streams
>   without a response body did not decrement the active stream count
>   when completing, leading to
>   ERR_HTTP2_SERVER_REFUSED_STREAM for some connections.
> 
> - Add an access log valve that uses a json format. Based on pull request
>   #539 provided by Thomas Meyer.
> 
> - Refactor synchronization blocks locking on SocketWrapper to use
>   ReentrantLock to support users wishing to experiment with project Loom.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.74/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1428
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.74
> db0c10ea25cc8984f72d700ea48f32aadc2fe2f4
> 
> The proposed 9.0.74 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 9.0.74

Tests pass with tc-native1.2.36 and OpenSSL 3.0.7 on macOS 12.3.1

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.8

2023-04-16 Thread Han Li



> On Apr 15, 2023, at 04:08, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.8 release is now available for
> voting.
> 
> The notable changes compared to 10.1.7 are:
> 
> - Reduce the default value of maxParameterCount from 10,000 to 1,000.
> 
> - Correct a regression in the fix for bug 66442 that meant that streams
>  without a response body did not decrement the active stream count
>  when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some
>  connections.
> 
> - Expand the validation of the value of the Sec-Websocket-Key header in
>  the HTTP upgrade request that initiates a WebSocket connection. The
>  value is not decoded but it is checked for the correct length and that
>  only valid characters from the base64 alphabet are used.
> 
> - Implement RFC 9239; note the MIME types for Javascript has changed
>  to text/javascript.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.8/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1429
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.8
> 477b206c9f05d2e70438a440bd40ab523662
> 
> The proposed 10.1.8 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.8

Tests pass.

Han
> 
> -
> 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: [tomcat] branch main updated: Fix checkstyle

2023-04-25 Thread Han Li



> On Apr 25, 2023, at 15:07, r...@apache.org wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new 7dbba140fd Fix checkstyle
> 7dbba140fd is described below
> 
> commit 7dbba140fd93d22af08decf2496edac5f73715f8
> Author: remm 
> AuthorDate: Tue Apr 25 09:06:21 2023 +0200
> 
>Fix checkstyle
> ---
> .../apache/tomcat/jdbc/pool/PoolPropertiesTest.java | 21 ++---
> 1 file changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git 
> a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/PoolPropertiesTest.java
>  
> b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/PoolPropertiesTest.java
> index b475d64f23..01843bd3e8 100644
> --- 
> a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/PoolPropertiesTest.java
> +++ 
> b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/PoolPropertiesTest.java
> @@ -1,12 +1,27 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements.  See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You under the Apache License, Version 2.0
> + * (the "License"); you may not use this file except in compliance with
> + * the License.  You may obtain a copy of the License at
> + *
> + *  http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */

Oops, thanks, I didn’t notice that this was missing.

Han
> package org.apache.tomcat.jdbc.pool;
> 
> +import java.util.ArrayList;
> +import java.util.List;
> 
> import org.junit.Assert;
> import org.junit.Test;
> 
> -import java.util.ArrayList;
> -import java.util.List;
> -
> public class PoolPropertiesTest {
> private static final String DEFAULT_USER = "username_def";
> private static final String DEFAULT_PASSWD = "password_def";
> 
> 
> -
> 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: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.7

2023-04-26 Thread Han Li



> On Apr 27, 2023, at 00:19, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.7 is now
> available for voting.
> 
> The significant changes since 1.0.6 are:
> 
> - Provide a workaround for a known JDK bug (JDK-8303866) that prevents
>  some migrated JARs from being read
> 
> - Add new matchExcludesAgainstPathName configuration option
> 
> - Include file names in the renaming process
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.7/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1431/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.7
> 0f74b6a7541c1f7ff26b9588a9ede92f316a7c46
> 
> The proposed 1.0.7 release is:
> 
> [ ] -1: Broken. Do not release because…
> [X ] +1: Acceptable. Go ahead and release.

Han

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



Re: Utility Executor

2023-04-27 Thread Han Li



> On Apr 28, 2023, at 00:33, Mark Thomas  wrote:
> 
> Hi all,
> 
> As part of a discussion around a Spring Boot issue [1], the question has been 
> raised whether there is merit in moving the Utility executor start/stop from 
> StandardServer init/destroy to start/stop.
> 
> I've looked at the code and I don't see any uses of the Executor until 
> sub-components are in the start phase (there is a little copying of 
> references that might need to move) so I think the change is doable.

Maybe ContainerBase#startStopExecutor also need same operation above?

> 
> The main advantage is that in the embedded scenario where there might be a 
> long series of start / stop / start / stop etc, shutting down the executor on 
> stop should avoid issues where executor tasks are not shutdown correctly. My 
> brief code review suggested that Tomcat does this correctly but the executor 
> is also exposed to application code.
> 
> Thoughts?
+ 1

> 
> Mark
> 
> [1] https://github.com/spring-projects/spring-boot/issues/34955
> 
> -
> 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: Utility Executor

2023-04-27 Thread Han Li


> On Apr 28, 2023, at 14:35, Rémy Maucherat  wrote:
> 
> On Fri, Apr 28, 2023 at 8:10 AM Romain Manni-Bucau
> mailto:rmannibu...@gmail.com>> wrote:
>> 
>> Hi
>> 
>> Guess this utility should be there very early so before other starts/stops
>> sounds good but ultimately init/destroy is better since it avoids to create
>> custom utility threads in subcomponents init/destroy (more destroy for real
>> cases I think, not sure for init).
> 
> The Server starts first and stops last, so it seems it will be fine. I
> don't quite see why it is a good idea to do utility tasks in init or
> destroyed (they should happen in start or stop).
> Right now the only item which needs to change is that the connector
> endpoint gets it on init.
Not only connector, also include ContainerBase and SimpleTcpCluster which also 
too.
Although I am not familiar with the initialization of SimpleTcpCluster, the 
code exists in init method ;)

Han

> The other components were using it on start.
> 
> Remy
> 
>> What about getting it injected from the context and ignoring its lifecycle
>> ("external" notion)? Will keep it globally usable and integrate smoothly
>> with any env.
>> 
>> 
>> Le ven. 28 avr. 2023 à 04:27, Han Li  a écrit :
>> 
>>> 
>>> 
>>>> On Apr 28, 2023, at 00:33, Mark Thomas  wrote:
>>>> 
>>>> Hi all,
>>>> 
>>>> As part of a discussion around a Spring Boot issue [1], the question has
>>> been raised whether there is merit in moving the Utility executor
>>> start/stop from StandardServer init/destroy to start/stop.
>>>> 
>>>> I've looked at the code and I don't see any uses of the Executor until
>>> sub-components are in the start phase (there is a little copying of
>>> references that might need to move) so I think the change is doable.
>>> 
>>> Maybe ContainerBase#startStopExecutor also need same operation above?
>>> 
>>>> 
>>>> The main advantage is that in the embedded scenario where there might be
>>> a long series of start / stop / start / stop etc, shutting down the
>>> executor on stop should avoid issues where executor tasks are not shutdown
>>> correctly. My brief code review suggested that Tomcat does this correctly
>>> but the executor is also exposed to application code.
>>>> 
>>>> Thoughts?
>>> + 1
>>> 
>>>> 
>>>> Mark
>>>> 
>>>> [1] https://github.com/spring-projects/spring-boot/issues/34955
>>>> 
>>>> -
>>>> 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 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [tomcat] branch main updated: Polish

2023-05-02 Thread Han Li
On Apr 30, 2023, at 23:37, Mark Thomas  wrote:

On 28/04/2023 03:58, li...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fa0b2b196d Polish
fa0b2b196d is described below
commit fa0b2b196d8525a662e9edec258650865da465ed
Author: lihan 
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Polish
---
java/org/apache/catalina/core/ContainerBase.java | 18 +++
java/org/apache/catalina/core/StandardServer.java | 26
+-
.../apache/catalina/valves/JsonAccessLogValve.java | 2 +-
3 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 9dc018be15..784c9032ef 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -377,7 +377,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
this.cluster = cluster;
// Stop the old component if necessary
- if (getState().isAvailable() && (oldCluster != null) && (oldCluster
instanceof Lifecycle)) {
+ if (getState().isAvailable() && (oldCluster instanceof Lifecycle)) {
try {
((Lifecycle) oldCluster).stop();
} catch (LifecycleException e) {
@@ -390,7 +390,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
cluster.setContainer(this);
}
- if (getState().isAvailable() && (cluster != null) && (cluster instanceof
Lifecycle)) {
+ if (getState().isAvailable() && (cluster instanceof Lifecycle)) {
try {
((Lifecycle) cluster).start();
} catch (LifecycleException e) {
@@ -580,7 +580,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
this.realm = realm;
// Stop the old component if necessary
- if (getState().isAvailable() && (oldRealm != null) && (oldRealm
instanceof Lifecycle)) {
+ if (getState().isAvailable() && (oldRealm instanceof Lifecycle)) {
try {
((Lifecycle) oldRealm).stop();
} catch (LifecycleException e) {
@@ -592,7 +592,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (realm != null) {
realm.setContainer(this);
}
- if (getState().isAvailable() && (realm != null) && (realm instanceof
Lifecycle)) {
+ if (getState().isAvailable() && (realm instanceof Lifecycle)) {
try {
((Lifecycle) realm).start();
} catch (LifecycleException e) {
@@ -832,8 +832,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
}
// Start our child containers, if any
- Container children[] = findChildren();
- List> results = new ArrayList<>();
+ Container[] children = findChildren();
+ List> results = new ArrayList<>(children.length);
for (Container child : children) {
results.add(startStopExecutor.submit(new StartChild(child)));
}
@@ -897,8 +897,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
}
// Stop our child containers, if any
- Container children[] = findChildren();
- List> results = new ArrayList<>();
+ Container[] children = findChildren();
+ List> results = new ArrayList<>(children.length);
for (Container child : children) {
results.add(startStopExecutor.submit(new StopChild(child)));
}
@@ -992,7 +992,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
}
AccessLogAdapter adapter = null;
- Valve valves[] = getPipeline().getValves();
+ Valve[] valves = getPipeline().getValves();
for (Valve valve : valves) {
if (valve instanceof AccessLog) {
if (adapter == null) {
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index eb5e91e932..09a223fa80 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -135,7 +135,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
/**
* The set of Services associated with this Server.
*/
- private Service services[] = new Service[0];
+ private Service[] services = new Service[0];
private final Object servicesLock = new Object();
@@ -175,12 +175,12 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
/**
* The number of threads available to process utility tasks in this service.
*/
- protected int utilityThreads = 2;
+ private int utilityThreads = 2;


This is changing the public API. We can do that in 11.0.x but not in
earlier versions. If we do make this change in 11.0.x then we really should
deprecated the field in at least 10.1.x to provide users with advance
warning of the change.


Sorry Mark, I am so confusing that why this called changed the public API.
According my review, users can not access this field directly with Server
instance as the modifier is protected and whom can not extend
StandardServer to do same operation as the modifier of Sta

Re: [VOTE] Release Apache Tomcat 11.0.0-M6

2023-05-03 Thread Han Li



> On May 4, 2023, at 02:38, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M6 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M6 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Various improvements to access logging.
> 
> - Remove support for the HTTP Connector settings rejectIllegalHeader and
>  allowHostHeaderMismatch. These are now hard-coded to the previous
>  defaults.
> 
> - Update the packaged version of the Tomcat Migration Tool for Jakarta
>  EE to 1.0.7.
> 
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M6/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1432
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M6
> 9ce010463a93138d596c54c67b11cdb35fc8244a
> 
> 
> The proposed 11.0.0-M6 release is:
> [ ] Broken - do not release
> [X] Alpha  - go ahead and release as 11.0.0-M6
+1

Tests pass with tc-native2.0.2 and OpenSSL3.0.7 on macOS 12.3.1

Han
> 
> -
> 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: Java 21 and virtual threads

2023-05-04 Thread Han Li



> On May 4, 2023, at 20:37, Mark Thomas  wrote:
> 
> Hi all,
> 
> The latest Java 21 EA build has moved virtual threads (from project Loom) out 
> of preview. How do we want to handle this in Tomcat 11? Recall that Jakarta 
> EE 11 has set Java 21 as the minimum version.
> 
> I think we have the following options:
> 
> 1. Stick with Java 17 as the minimum version and don't provide virtual thread 
> functionality.
> 
> 2. Stick with Java 17 as the minimum version and provide virtual thread 
> functionality via the JreCompat module.
> 
> 3. Increase minimum Java version to Java 21 for Tomcat 11 and provide virtual 
> thread functionality.
+1

The impact of switching 17 to 21 will not be very wide I think as Tomcat 11 is 
Alpha version now, so let’s be straightforward. :)

Han

> 
> I am currently leaning towards 3 but could live with 2.
> 
> Thoughts? Other options?
> 
> Mark
> 
> PS Option 3 will require updates to the CI systems - I am happy to take care 
> of those.
> 
> PPS I don't think all of the current Loom module will make it into Tomcat 11. 
> I am currently thinking to pull in the Executor and then provide a boolean 
> option for the existing endpoints to switch the internal executor to Loom.
> 
> -
> 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: [tomcat] 02/02: Move management of utility executor from init/destroy to start/stop

2023-05-04 Thread Han Li



> On May 4, 2023, at 21:41, ma...@apache.org wrote:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> commit 4b097bf2e9075e9e2949ec5aa410cba3c2b85374
> Author: Mark Thomas 
> AuthorDate: Thu May 4 14:41:01 2023 +0100
> 
>Move management of utility executor from init/destroy to start/stop
> ---
> java/org/apache/catalina/connector/Connector.java  | 13 +++---
> java/org/apache/catalina/core/ContainerBase.java   | 20 +++-
> java/org/apache/catalina/core/StandardServer.java  | 28 +++---
> .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  5 +++-
> webapps/docs/changelog.xml |  5 
> 5 files changed, 41 insertions(+), 30 deletions(-)
> 
> diff --git a/java/org/apache/catalina/connector/Connector.java 
> b/java/org/apache/catalina/connector/Connector.java
> index c9200e20ca..dac7fdd642 100644
> --- a/java/org/apache/catalina/connector/Connector.java
> +++ b/java/org/apache/catalina/connector/Connector.java
> @@ -992,9 +992,6 @@ public class Connector extends LifecycleMBeanBase {
> // Initialize adapter
> adapter = new CoyoteAdapter(this);
> protocolHandler.setAdapter(adapter);
> -if (service != null) {
> -
> protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
> -}
> 
> // Make sure parseBodyMethodsSet has a default
> if (null == parseBodyMethodsSet) {
> @@ -1035,6 +1032,11 @@ public class Connector extends LifecycleMBeanBase {
> 
> setState(LifecycleState.STARTING);
> 
> +// Configure the utility executor before starting the protocol 
> handler
> +if (service != null) {
> +
> protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());

According to check logic at line 1027,  the protocalHandler may be null, so 
need NPE check.
> +}
> +
> try {
> protocolHandler.start();
> } catch (Exception e) {
> @@ -1060,6 +1062,11 @@ public class Connector extends LifecycleMBeanBase {
> } catch (Exception e) {
> throw new 
> LifecycleException(sm.getString("coyoteConnector.protocolHandlerStopFailed"), 
> e);
> }
> +
> +// Remove the utility executor once the protocol handler has been 
> stopped
> +if (service != null) {
> +protocolHandler.setUtilityExecutor(null);
Same as above.

Han
> +}
> }
> 
> 
> diff --git a/java/org/apache/catalina/core/ContainerBase.java 
> b/java/org/apache/catalina/core/ContainerBase.java
> index 784c9032ef..a7e7c69a4a 100644
> --- a/java/org/apache/catalina/core/ContainerBase.java
> +++ b/java/org/apache/catalina/core/ContainerBase.java
> @@ -787,13 +787,6 @@ public abstract class ContainerBase extends 
> LifecycleMBeanBase implements Contai
> }
> 
> 
> -@Override
> -protected void initInternal() throws LifecycleException {
> -reconfigureStartStopExecutor(getStartStopThreads());
> -super.initInternal();
> -}
> -
> -
> private void reconfigureStartStopExecutor(int threads) {
> if (threads == 1) {
> // Use a fake executor
> @@ -819,6 +812,8 @@ public abstract class ContainerBase extends 
> LifecycleMBeanBase implements Contai
> @Override
> protected synchronized void startInternal() throws LifecycleException {
> 
> +reconfigureStartStopExecutor(getStartStopThreads());
> +
> // Start our subordinate components, if any
> logger = null;
> getLogger();
> @@ -925,6 +920,12 @@ public abstract class ContainerBase extends 
> LifecycleMBeanBase implements Contai
> if (cluster instanceof Lifecycle) {
> ((Lifecycle) cluster).stop();
> }
> +
> +// If init fails, this may be null
> +if (startStopExecutor != null) {
> +startStopExecutor.shutdownNow();
> +startStopExecutor = null;
> +}
> }
> 
> @Override
> @@ -954,11 +955,6 @@ public abstract class ContainerBase extends 
> LifecycleMBeanBase implements Contai
> parent.removeChild(this);
> }
> 
> -// If init fails, this may be null
> -if (startStopExecutor != null) {
> -startStopExecutor.shutdownNow();
> -}
> -
> super.destroyInternal();
> }
> 
> diff --git a/java/org/apache/catalina/core/StandardServer.java 
> b/java/org/apache/catalina/core/StandardServer.java
> index 80b5026fed..a4383f2503 100644
> --- a/java/org/apache/catalina/core/StandardServer.java
> +++ b/java/org/apache/catalina/core/StandardServer.java
> @@ -901,6 +901,12 @@ public final class StandardServer extends 
> LifecycleMBeanBase implements Server {
> fireLifecycleEvent(CONFIGURE_START_EVENT, null);
> setState(LifecycleState.STARTING);
> 
> +// Initialize utility executor
> +syn

Re: [VOTE] Release Apache Tomcat 9.0.75

2023-05-04 Thread Han Li



> On May 4, 2023, at 22:20, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.75 release is now available for voting.
> 
> The notable changes compared to 9.0.74 are:
> 
> - Many improvements to the json access log valve.
> 
> - Deprecate support for the HTTP Connector settings rejectIllegalHeader and
>   allowHostHeaderMismatch.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.75/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1433
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.75
> 2f528c02a9b54cc210897f75492a2bb6eac326b5
> 
> The proposed 9.0.75 release is:
> [ ] -1, Broken - do not release
> [X ] +1, Stable - go ahead and release as 9.0.75

Test pass with tc-natvie 1.2.36 and OpenSSL 3.0.7 on macOS 12.3.1

Han
> 
> Rémy
> 
> -
> 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: [tomcat] 02/02: Move management of utility executor from init/destroy to start/stop

2023-05-05 Thread Han Li


> On May 5, 2023, at 18:42, Mark Thomas  wrote:
> 
> On 05/05/2023 04:21, Han Li wrote:
>>> On May 4, 2023, at 21:41, ma...@apache.org wrote:
>>> 
>>> This is an automated email from the ASF dual-hosted git repository.
>>> 
>>> markt pushed a commit to branch main
>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>> 
>>> commit 4b097bf2e9075e9e2949ec5aa410cba3c2b85374
>>> Author: Mark Thomas 
>>> AuthorDate: Thu May 4 14:41:01 2023 +0100
>>> 
>>> Move management of utility executor from init/destroy to start/stop
>>> ---
>>> java/org/apache/catalina/connector/Connector.java | 13 +++---
>>> java/org/apache/catalina/core/ContainerBase.java | 20 +++-
>>> java/org/apache/catalina/core/StandardServer.java | 28 
>>> +++---
>>> .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 5 +++-
>>> webapps/docs/changelog.xml | 5 
>>> 5 files changed, 41 insertions(+), 30 deletions(-)
>>> 
>>> diff --git a/java/org/apache/catalina/connector/Connector.java 
>>> b/java/org/apache/catalina/connector/Connector.java
>>> index c9200e20ca..dac7fdd642 100644
>>> --- a/java/org/apache/catalina/connector/Connector.java
>>> +++ b/java/org/apache/catalina/connector/Connector.java
>>> @@ -992,9 +992,6 @@ public class Connector extends LifecycleMBeanBase {
>>> // Initialize adapter
>>> adapter = new CoyoteAdapter(this);
>>> protocolHandler.setAdapter(adapter);
>>> - if (service != null) {
>>> - 
>>> protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
>>> - }
>>> 
>>> // Make sure parseBodyMethodsSet has a default
>>> if (null == parseBodyMethodsSet) {
>>> @@ -1035,6 +1032,11 @@ public class Connector extends LifecycleMBeanBase {
>>> 
>>> setState(LifecycleState.STARTING);
>>> 
>>> + // Configure the utility executor before starting the protocol handler
>>> + if (service != null) {
>>> + 
>>> protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
>> According to check logic at line 1027, the protocalHandler may be null, so 
>> need NPE check.
> 
> I'm not convinced that check is necessary given the call to 
> protocalHandler.start() just below. I need to look into this more to see why 
> the null check is there.

I have also looked into this and found which related to 
org.apache.catalina.connector.TestConnector#doTestInvalidProtocol.
The reason that why this has three conditions:
1. The protocol is invalid
2. The thorwOnFailure has been set false

2) lead the null check in initInternal method has invalid and go on to 
startInternal.


Han

> 
>>> + }
>>> +
>>> try {
>>> protocolHandler.start();
>>> } catch (Exception e) {
>>> @@ -1060,6 +1062,11 @@ public class Connector extends LifecycleMBeanBase {
>>> } catch (Exception e) {
>>> throw new 
>>> LifecycleException(sm.getString("coyoteConnector.protocolHandlerStopFailed"),
>>>  e);
>>> }
>>> +
>>> + // Remove the utility executor once the protocol handler has been stopped
>>> + if (service != null) {
>>> + protocolHandler.setUtilityExecutor(null);
>> Same as above.
> 
> I agree on this one.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [VOTE] Release Apache Tomcat 10.1.9

2023-05-10 Thread Han Li



> On May 10, 2023, at 00:12, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.9 release is now available for
> voting.
> 
> The notable changes compared to 10.1.8 are:
> 
> - Many improvements to the JSON access log valve.
> 
> - Deprecate support for the HTTP Connector settings rejectIllegalHeader
>  and allowHostHeaderMismatch and reject HTTP headers without names.
> 
> - Add a RateLimitFilter which can be used to mitigate DoS and Brute
>  Force attacks.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.9/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1435
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.9
> 5d45c1a9359c2298d7140c1ca90cb8c43809a168
> 
> The proposed 10.1.9 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 10.1.9

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M18

2024-03-12 Thread Han Li



> On Mar 10, 2024, at 02:52, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M18 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M18 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Reduce minimum Java version to Java 17
> 
> - When restoring a saved POST request after a successful FORM
>  authentication, ensure that neither the URI, the query string no
>  the protocol are corrupted when restoring the request body.
> 
> - Align error handling for Writer and OutputStream. Ensure use of either
>  once the response has been recycled triggers a NullPointerException
>  provided that discardFacades is configured with the default value of
>  true.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M18/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1484
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M18
> eee0dbb29048a60ee2c85ebcb9abb1750046c0bf
> 
> The proposed 11.0.0-M18 release is:
> [ ] -1 Broken - do not release
> [X] +1 Alpha  - go ahead and release as 11.0.0-M18

Tests pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.87

2024-03-12 Thread Han Li



> On Mar 11, 2024, at 19:09, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.87 release is now available for voting.
> 
> The notable changes compared to 9.0.86 are:
> 
> - When restoring a saved POST request after a successful FORM
>   authentication, ensure that neither the URI, the query string nor
>   the protocol are corrupted when restoring the request body.
> 
> - Align error handling for Writer and OutputStream. Ensure use of either
>   once the response has been recycled triggers a NullPointerException
>   provided that discardFacades is configured with the default value of
>   true.
> 
> - The standard thread pool implementations that are
>   configured using the Executor element now implement
>   ExecutorService for better support of NIO2 or others.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.87/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1485
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.87
> 4c4c166c3d7fd2d00801657c7a78fc7d46c8ec32
> 
> The proposed 9.0.87 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.87
Tests pass.

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.22

2024-04-11 Thread Han Li



> On Apr 11, 2024, at 02:51, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.22 release is now available for
> voting. Apache Tomcat 10.1.21 was canceled due to a release-build mistake. 
> There are no source-level changes between 10.1.21 and 10.1.22.
> 
> The notable changes compared to 10.1.20 are:
> 
> - Add OpenSSL support when FFM is available
> 
> - Improve locking strategies in Catalina core
> 
> - Updates to Apache Commons dependencies
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.22/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1491
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.22
> fd9c0bb1f0a7e586daabfda625ef50827bcfddf3
> 
> Please reply with a +1 for release or -0/-1 with an explanation.
> 
> The proposed 10.1.22 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.22

+1

Tests pass on macOS 12.3.1.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.88

2024-04-14 Thread Han Li



> On Apr 9, 2024, at 21:54, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.88 release is now available for voting.
> 
> The notable changes compared to 9.0.87 are:
> 
> - Cookies header generation enhancements.
> 
> - Fix regression when reloading TLS configuration and files.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.88/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1489
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.88
> e644d98329aca2ccf7f2014c0670c5fabc7fcb16
> 
> The proposed 9.0.88 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.88

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M19

2024-04-14 Thread Han Li



> On Apr 9, 2024, at 21:13, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M19 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M19 is a milestone release of the 11.0.x branch and
> has been made to provide users with early access to the new features in
> Apache Tomcat 11.0.x so that they may provide feedback. The notable
> changes compared to the previous milestone include:
> 
> - Finalize update to the Jakarta EE 11 specifications.
> 
> - Cookies header generation enhancements.
> 
> - Fix regression when reloading TLS configuration and files.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory. Applications using deprecated APIs may require
> further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M19/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1488
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M19
> 19e301275f23056e3c46ab296c87cf6e16fbe68f
> 
> The proposed 11.0.0-M19 release is:
> [ ] -1 Broken - do not release
> [X] +1 Alpha  - go ahead and release as 11.0.0-M19

Han
> 
> -
> 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: APPROVE MY ICLA

2024-04-14 Thread Han Li
Please read this document[1] carefully, how to become a committer.

Again, there is no thread about inviting you to become a committer, so you 
don't have to sign ICLA, so please don't spam us like this again.

Han

[1] https://community.apache.org/newcommitter.html#new-committer-process

> On Apr 15, 2024, at 10:05, Koteswararao Gundapaneni 
>  wrote:
> 
> Please approve my request
> 
> -
> 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-jakartaee-migration #34 issue

2022-09-14 Thread Han Li
Hi all,

I am very sorry, I made a fatal mistake when fixing tomcat-jakartaee-migration 
#29 issue, which led to #34 issue.

I have re-fixed this issue with this solution: 
https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
 

(I 'll continue optimising code tomorrow, it's late and I'm sleepy.)

I will retest it tomorrow to make sure the problem is really fixed.

But I don't know if this will affect the release tasks , like 10.1.x or other 
version.

How will we handle this situation, possibly by continuing to release 
tomcat-jakartaee-migration 1.0.4?


Best Regard

Han

Re: tomcat-jakartaee-migration #34 issue

2022-09-14 Thread Han Li


> 2022年9月15日 04:06,Rémy Maucherat  写道:
> 
> On Wed, Sep 14, 2022 at 6:43 PM Han Li  wrote:
>> 
>> Hi all,
>> 
>> I am very sorry, I made a fatal mistake when fixing 
>> tomcat-jakartaee-migration #29 issue, which led to #34 issue.
> 
> Well, when you do things, you're more likely to break things. So no
> need to apologize.
: )  Thanks.


> 
>> I have re-fixed this issue with this solution: 
>> https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
>>  
>> <https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239>
>> (I 'll continue optimising code tomorrow, it's late and I'm sleepy.)
>> 
>> I will retest it tomorrow to make sure the problem is really fixed.
>> 
>> But I don't know if this will affect the release tasks , like 10.1.x or 
>> other version.
>> 
>> How will we handle this situation, possibly by continuing to release 
>> tomcat-jakartaee-migration 1.0.4?
> 
> With a regression, a 1.0.4 is needed, then start over the 10.1 and
> 10.0 release process.
I have fixed it.

> Good thing my internet access is "dead" (I hope
> it will be fixed tomorrow), I haven't started 9.0 yet.
Hmmm, Maybe your internet  has “guessed” in advance  that there was a problem 
with my fix. ;)

Han

> 
> Rémy
> 
>> 
>> Best Regard
>> 
>> Han
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 



Re: tomcat-jakartaee-migration #34 issue

2022-09-15 Thread Han Li


> 2022年9月15日 15:43,Mark Thomas  写道:
> 
> 
> On 15/09/2022 06:44, Han Li wrote:
>>> 2022年9月15日 04:06,Rémy Maucherat  写道:
>>> 
>>> On Wed, Sep 14, 2022 at 6:43 PM Han Li  wrote:
>>>> 
>>>> Hi all,
>>>> 
>>>> I am very sorry, I made a fatal mistake when fixing 
>>>> tomcat-jakartaee-migration #29 issue, which led to #34 issue.
>>> 
>>> Well, when you do things, you're more likely to break things. So no
>>> need to apologize.
> 
> +1
> 
> We all make mistakes. One of the hardest things I had to get use to with open 
> source was messing up in public. I was mortified the first time I did it. 
> These days, I just fix whatever I broke and move on to the next task.
> 
> One of the reasons for stream-lining the release process is so that we can 
> easily restart a release if we need to.

: ) Thanks Mark.

I feel more confident to continue doing what I am interested.

Han
> 
>> : ) Thanks.
>>> 
>>>> I have re-fixed this issue with this solution: 
>>>> https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239
>>>>  
>>>> <https://github.com/aooohan/tomcat-jakartaee-migration/blob/e07f9cb21b36fe44ef31cc97e39e2c1657a94424/src/main/java/org/apache/tomcat/jakartaee/Migration.java#L226-L239>
>>>> (I 'll continue optimising code tomorrow, it's late and I'm sleepy.)
>>>> 
>>>> I will retest it tomorrow to make sure the problem is really fixed.
>>>> 
>>>> But I don't know if this will affect the release tasks , like 10.1.x or 
>>>> other version.
>>>> 
>>>> How will we handle this situation, possibly by continuing to release 
>>>> tomcat-jakartaee-migration 1.0.4?
>>> 
>>> With a regression, a 1.0.4 is needed, then start over the 10.1 and
>>> 10.0 release process.
>> I have fixed it.
> 
> I'll start the 1.0.4 release now and cancel the 10.1.x and 10.0.x releases.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.4

2022-09-15 Thread Han Li



> 2022年9月15日 17:06,Mark Thomas  写道:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.4 is now
> available for voting.
> 
> The significant changes since 1.0.3 are:
> 
> - Issue #26 - Re-fix
> - PR #28 - Add Jakarta EE -. Java EE profile (with warnings)
> - Add checkstyle
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.4/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1392/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.4
> a74aad315b8af81de0fa1837acc2adb278f5cb5a
> 
> The proposed 1.0.4 release is:
> 
> [ ] -1: Broken. Do not release because...
> [ X] +1: Acceptable. Go ahead and release.

Unit tests pass.

Sample application that has migrated which runs properly on Tomcat 10.0.23 with 
some SORTED jars.

Han

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



Re: [VOTE] Release Apache Tomcat 10.1.0-M20

2022-09-21 Thread Han Li



> 2022年9月21日 02:35,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.1.0-M20 release is now available for
> voting.
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> The notable changes compared to 10.1.0-M17 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>  proxy when establishing a connection to a WebSocket endpoint via a
>  forward proxy that requires authentication. Based on a patch provided
>  by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing
> 
> - Improve host header handling for HTTP/2 requests
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M20/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1393
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0-M20
> 920e86e465fc9db8b0c21b684b42456179308cfd
> 
> 
> The proposed 10.1.0-M20 release is:
> [ ] Broken - do not release
> [ X] Beta - go ahead and release as 10.1.0-M20 (beta)
Unit tests pass with Tomcat Native 2.0.1 and OpenSSL 3.0.5 on macOS 12.3.1.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.0.25

2022-09-22 Thread Han Li



> 2022年9月22日 17:06,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.0.25 release is now available for
> voting.
> 
> Apache Tomcat 10.0.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. 
> Java EE applications designed for Tomcat 9 and earlier may be placed in the 
> $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert 
> them to Jakarta EE and copy them to the webapps directory
> 
> The notable changes compared to 10.0.23 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>  proxy when establishing a connection to a WebSocket endpoint via a
>  forward proxy that requires authentication. Based on a patch provided
>  by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing
> 
> - Improve host header handling for HTTP/2 requests
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.25/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1394
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.25
> 570397299d8a1d2c84d1bc34625758d995b38b7f
> 
> The proposed 10.0.25 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 10.0.25 (stable)

Unit tests pass with Tomcat Native 1.2.35 and OpenSSL 3.0.5 on macOS 12.3.1.

Han

> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.66

2022-09-22 Thread Han Li



> 2022年9月22日 17:21,Rémy Maucherat  写道:
> 
> The proposed Apache Tomcat 9.0.66 release is now available for voting.
> 
> The notable changes compared to 9.0.65 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>   proxy when establishing a connection to a WebSocket endpoint via a
>   forward proxy that requires authentication. Based on a patch provided
>   by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing.
> 
> - Improve host header handling for HTTP/2 requests.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.66/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1395
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.66
> f4d5910eadd7c7c1a3580258712f52c47aef9dea
> 
> The proposed 9.0.66 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 9.0.66 (stable)
Unit tests pass with Tomcat Native 1.2.35 and OpenSSL 3.0.5 on macOS 12.3.1.

Han
> 
> Rémy
> 
> -
> 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: [tomcat] branch 9.0.x updated: Fix missing attributes

2022-09-22 Thread Han Li



> 2022年9月23日 05:17,r...@apache.org 写道:
> 
> 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 7fda27272f Fix missing attributes
> 7fda27272f is described below
> 
> commit 7fda27272ff6cfb6ca920451a72f62e1c62a8ba3
> Author: remm 
> AuthorDate: Thu Sep 22 22:56:19 2022 +0200
> 
>Fix missing attributes
> 
>The code is very confusing, but the main attribute map can contain
>either the get or set method as the value, so it must not be used. This
>should probably be refactored some more ...

I will do this work today. ;)

Han

> ---
> .../modeler/modules/MbeansDescriptorsIntrospectionSource.java | 2 +-
> webapps/docs/changelog.xml| 8 
> 2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git 
> a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
>  
> b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
> index 05f393d023..ffb0937066 100644
> --- 
> a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
> +++ 
> b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
> @@ -311,7 +311,7 @@ public class MbeansDescriptorsIntrospectionSource extends 
> ModelerSource
> String name = attEntry.getKey();
> AttributeInfo ai = new AttributeInfo();
> ai.setName(name);
> -Method gm = attEntry.getValue();
> +Method gm = getAttMap.get(name);
> if (gm != null) {
> ai.setGetMethod(gm.getName());
> Class t = gm.getReturnType();
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index 7c79ceb65e..1d1a098173 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -105,6 +105,14 @@
>   issues do not "pop up" wrt. others).
> -->
> 
> +  
> +
> +  
> +Fix a regression in refactoring for Hashtables which caused mbeans to
> +lose many of their attributes. (remm)
> +  
> +
> +  
> 
> 
>   
> 
> 
> -
> 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: [tomcat] branch 9.0.x updated: Fix missing attributes

2022-09-23 Thread Han Li



> 2022年9月23日 14:51,Rémy Maucherat  写道:
> 
> On Fri, Sep 23, 2022 at 5:43 AM Han Li  wrote:
>> 
>> 
>> 
>>> 2022年9月23日 05:17,r...@apache.org 写道:
>>> 
>>> 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 7fda27272f Fix missing attributes
>>> 7fda27272f is described below
>>> 
>>> commit 7fda27272ff6cfb6ca920451a72f62e1c62a8ba3
>>> Author: remm 
>>> AuthorDate: Thu Sep 22 22:56:19 2022 +0200
>>> 
>>>   Fix missing attributes
>>> 
>>>   The code is very confusing, but the main attribute map can contain
>>>   either the get or set method as the value, so it must not be used. This
>>>   should probably be refactored some more ...
>> 
>> I will do this work today. ;)
> 
> I think it would be best to avoid any further unnecessary refactorings
> for now, until the next release is actually out :)
OK.

Han


> 
> Thanks !
> 
> Rémy
> 
>> Han
>> 
>>> ---
>>> .../modeler/modules/MbeansDescriptorsIntrospectionSource.java | 2 +-
>>> webapps/docs/changelog.xml| 8 
>>> 
>>> 2 files changed, 9 insertions(+), 1 deletion(-)
>>> 
>>> diff --git 
>>> a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
>>>  
>>> b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
>>> index 05f393d023..ffb0937066 100644
>>> --- 
>>> a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
>>> +++ 
>>> b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
>>> @@ -311,7 +311,7 @@ public class MbeansDescriptorsIntrospectionSource 
>>> extends ModelerSource
>>>String name = attEntry.getKey();
>>>AttributeInfo ai = new AttributeInfo();
>>>ai.setName(name);
>>> -Method gm = attEntry.getValue();
>>> +Method gm = getAttMap.get(name);
>>>if (gm != null) {
>>>ai.setGetMethod(gm.getName());
>>>Class t = gm.getReturnType();
>>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>>> index 7c79ceb65e..1d1a098173 100644
>>> --- a/webapps/docs/changelog.xml
>>> +++ b/webapps/docs/changelog.xml
>>> @@ -105,6 +105,14 @@
>>>  issues do not "pop up" wrt. others).
>>> -->
>>> 
>>> +  
>>> +
>>> +  
>>> +Fix a regression in refactoring for Hashtables which caused mbeans 
>>> to
>>> +lose many of their attributes. (remm)
>>> +  
>>> +
>>> +  
>>> 
>>> 
>>>  
>>> 
>>> 
>>> -
>>> 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
> 


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

2022-09-23 Thread Han Li



> 2022年9月23日 17:44,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.1.0 release is now available for
> voting.
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> The notable changes compared to 10.1.0-M17 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>  proxy when establishing a connection to a WebSocket endpoint via a
>  forward proxy that requires authentication. Based on a patch provided
>  by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing
> 
> - Improve host header handling for HTTP/2 requests
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1396
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0
> e9d17cddc285615807ec5fef09240777436b25dc
> 
> 
> The proposed 10.1.0 release is:
> [ ] Broken - do not release
> [ ] Beta   - go ahead and release as 10.1.0 (beta)
> [ X] Stable - go ahead and release as 10.1.0 (stable)

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.67

2022-09-24 Thread Han Li



> 2022年9月23日 20:03,Rémy Maucherat  写道:
> 
> The proposed Apache Tomcat 9.0.67 release is now available for voting.
> 
> The notable changes compared to 9.0.65 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>   proxy when establishing a connection to a WebSocket endpoint via a
>   forward proxy that requires authentication. Based on a patch provided
>   by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing.
> 
> - Improve host header handling for HTTP/2 requests.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.67/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1397
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.67
> 5f818dfac98784d805830adcff41315d4edd9f7c
> 
> The proposed 9.0.67 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 9.0.67 (stable)

Han

> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.0.26

2022-09-24 Thread Han Li



> 2022年9月23日 19:58,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.0.26 release is now available for
> voting.
> 
> Apache Tomcat 10.0.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. 
> Java EE applications designed for Tomcat 9 and earlier may be placed in the 
> $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert 
> them to Jakarta EE and copy them to the webapps directory
> 
> The notable changes compared to 10.0.23 are:
> 
> - Add support for authenticating WebSocket clients with an HTTP forward
>  proxy when establishing a connection to a WebSocket endpoint via a
>  forward proxy that requires authentication. Based on a patch provided
>  by Joe Mokos.
> 
> - Various fixes for edge case bugs in EL processing
> 
> - Improve host header handling for HTTP/2 requests
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.26/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1398
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.26
> b54b582e7cb867eccfee24d87d818a3ef6ef07dc
> 
> The proposed 10.0.26 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 10.0.26 (stable)

Han

> 
> -
> 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: Status of 10.0.x

2022-09-26 Thread Han Li



> 2022年9月26日 23:07,Rémy Maucherat  写道:
> 
> On Mon, Sep 26, 2022 at 4:51 PM Mark Thomas  wrote:
>> 
>> Hi all,
>> 
>> Now 10.1.x is stable, how to we want to handle 10.0.x? Than plan has
>> always been that we would support 10.0.x until 10.1.x was stable.
>> 
>> Assuming the vote passes (we need 1 more +1) then there will be a
>> 10.0.26 release. Do we want that to be the last 10.0.x. release? If,
>> not, how many more 10.0.x releases should there be?
> 
> I'm not against stopping at 10.0.26 and directing people to 10.1.

+1

Han

> Maybe we could make a promise for critical security fixes for a period
> of time ?
> 
> Another item: there was supposed to be a 9.10 branch. But right now,
> the changes are probably not significant enough and it's simply better
> for everyone to keep all the work on 9.0.
> 
>> Keep in mind that work on 11.0.x could start shortly - thread about that
>> to follow.
> 
> Ok !
> 
> 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: [tomcat] branch main updated: Fix BZ66276

2022-09-27 Thread Han Li
I don’t  know where the changelog entry is placed as 10.0.26 is not released, 
so I don’t back-port this change.
After 10.0.26 release, I will go on.

Han

> 2022年9月27日 15:30,li...@apache.org 写道:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> lihan pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new 1ae46b1555 Fix BZ66276
> 1ae46b1555 is described below
> 
> commit 1ae46b15557067273aad2e2f16873e0c73515435
> Author: lihan 
> AuthorDate: Tue Sep 27 15:29:53 2022 +0800
> 
>Fix BZ66276
> 
>https://bz.apache.org/bugzilla/show_bug.cgi?id=66276
> ---
> java/org/apache/coyote/http2/AbstractNonZeroStream.java | 4 ++--
> webapps/docs/changelog.xml  | 8 
> 2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java 
> b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
> index 0368c4fa6c..f67b17f7d9 100644
> --- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
> +++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
> @@ -75,8 +75,8 @@ abstract class AbstractNonZeroStream extends AbstractStream 
> {
> if (isDescendant(parent)) {
> parent.detachFromParent();
> // Cast is always safe since any descendant of this stream must be
> -// an instance of Stream
> -getParentStream().addChild((Stream) parent);
> +// an instance of AbstractNonZeroStream
> +getParentStream().addChild((AbstractNonZeroStream) parent);
> }
> 
> if (exclusive) {
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index e8ea7712b6..85e487007a 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -105,6 +105,14 @@
>   issues do not "pop up" wrt. others).
> -->
> 
> +  
> +
> +  
> +66276: Fix incorrect class cast when adding
> +a descendant of HTTP/2 streams. (lihan)
> +  
> +
> +  
> 
> 
>   
> 
> 
> -
> 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: [tomcat] branch main updated: Fix BZ66276

2022-09-27 Thread Han Li


> 2022年9月27日 15:43,Mark Thomas  写道:
> 
> On 27/09/2022 08:40, Han Li wrote:
>> I don’t know where the changelog entry is placed as 10.0.26 is not released, 
>> so I don’t back-port this change.
>> After 10.0.26 release, I will go on.
> 
> Sorry, I haven't been very good at updating version numbers after tagging. 
> I've just done 10.0.x. You should be OK to back-port now.
Done. ;)

Han
> 
> Mark
> 
> 
>> Han
>>> 2022年9月27日 15:30,li...@apache.org 写道:
>>> 
>>> This is an automated email from the ASF dual-hosted git repository.
>>> 
>>> lihan pushed a commit to branch main
>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>> 
>>> 
>>> The following commit(s) were added to refs/heads/main by this push:
>>> new 1ae46b1555 Fix BZ66276
>>> 1ae46b1555 is described below
>>> 
>>> commit 1ae46b15557067273aad2e2f16873e0c73515435
>>> Author: lihan 
>>> AuthorDate: Tue Sep 27 15:29:53 2022 +0800
>>> 
>>> Fix BZ66276
>>> 
>>> https://bz.apache.org/bugzilla/show_bug.cgi?id=66276
>>> ---
>>> java/org/apache/coyote/http2/AbstractNonZeroStream.java | 4 ++--
>>> webapps/docs/changelog.xml | 8 
>>> 2 files changed, 10 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java 
>>> b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
>>> index 0368c4fa6c..f67b17f7d9 100644
>>> --- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
>>> +++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
>>> @@ -75,8 +75,8 @@ abstract class AbstractNonZeroStream extends 
>>> AbstractStream {
>>> if (isDescendant(parent)) {
>>> parent.detachFromParent();
>>> // Cast is always safe since any descendant of this stream must be
>>> - // an instance of Stream
>>> - getParentStream().addChild((Stream) parent);
>>> + // an instance of AbstractNonZeroStream
>>> + getParentStream().addChild((AbstractNonZeroStream) parent);
>>> }
>>> 
>>> if (exclusive) {
>>> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
>>> index e8ea7712b6..85e487007a 100644
>>> --- a/webapps/docs/changelog.xml
>>> +++ b/webapps/docs/changelog.xml
>>> @@ -105,6 +105,14 @@
>>> issues do not "pop up" wrt. others).
>>> -->
>>> 
>>> + 
>>> + 
>>> + 
>>> + 66276: Fix incorrect class cast when adding
>>> + a descendant of HTTP/2 streams. (lihan)
>>> + 
>>> + 
>>> + 
>>> 
>>> 
>>> 
>>> 
>>> 
>>> -
>>> 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 
>> <mailto:dev-unsubscr...@tomcat.apache.org>
>> For additional commands, e-mail: dev-h...@tomcat.apache.org 
>> <mailto:dev-h...@tomcat.apache.org>
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: Security manager support

2022-09-28 Thread Han Li



> 2022年9月29日 00:16,Rémy Maucherat  写道:
> 
> On Wed, Sep 28, 2022 at 5:41 PM Mark Thomas  wrote:
>> 
>> On 28/09/2022 16:05, Emmanuel Bourg wrote:
>>> Hi all,
>>> 
>>> The security manager has been deprecated for removal in Java 17 [1], and
>>> at some point Tomcat will have to stop supporting it.
>>> 
>>> Do we want to wait until it's no longer available in the JDK to remove
>>> it from Tomcat, or should we remove it earlier, maybe in Tomcat 10.1 or 11?
>>> 
>>> I tend to think there are better solutions at the OS level to isolate a
>>> Tomcat instance nowadays, and I lean toward dropping it before its
>>> removal from the JDK.
>>> 
>>> What do you think?
>> 
>> I was thinking of proposing its removal for Tomcat 11. I think 10.1 is a
>> little early.
> 
> +1 if we want to attempt it 11 would be a plan. 12 would be too far
> away (it's frustrating !). -1 for 10.1, it's released now.
+1 
: )

Han
> 
> 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: [VOTE] Release Apache Tomcat 10.0.27

2022-10-07 Thread Han Li



> 2022年10月4日 00:13,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.0.27 release is now available for
> voting.
> 
> Apache Tomcat 10.0.27 is likely to be the last release of the 10.0.x series. 
> Users of 10.0.x should plan to move to 10.1.x at the next update.
> 
> Apache Tomcat 10.0.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. 
> Java EE applications designed for Tomcat 9 and earlier may be placed in the 
> $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert 
> them to Jakarta EE and copy them to the webapps directory
> 
> The notable changes compared to 10.0.27 are:
> 
> - Fix bug 66277, a refactoring regression that broke JSP includes
>  amongst other functionality
> 
> - Fix unexpected timeouts that may appear as client disconnections when
>  using HTTP/2 and NIO2
> 
> - Enforce the requirement of RFC 7230 onwards that a request with a
>  malformed content-length header should always be rejected with a 400
>  response.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.27/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1400
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.27
> ca8720d41f3be917dc3fcdd03fcca8d3152a13fb
> 
> The proposed 10.0.27 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 10.0.27 (stable)

Han
> 
> -
> 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: [tomcat] branch main updated: Refactor. Simplify 'Map' operations. No functional change.

2022-10-09 Thread Han Li


> 2022年10月10日 01:07,Mark Thomas  写道:
> 
> On 08/10/2022 04:10, li...@apache.org  wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>> lihan pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> The following commit(s) were added to refs/heads/main by this push:
>> new 52774c2467 Refactor. Simplify 'Map' operations. No functional change.
>> 52774c2467 is described below
>> commit 52774c24678f11ca7aadc02d98dca156e8c36b3d
>> Author: lihan 
>> AuthorDate: Sat Oct 8 11:10:30 2022 +0800
>> Refactor. Simplify 'Map' operations. No functional change.
>> ---
>> java/org/apache/catalina/connector/Request.java | 8 ++--
>> .../catalina/core/ApplicationPushBuilder.java | 8 +---
>> java/org/apache/catalina/core/StandardContext.java | 23 
>> ++
>> .../apache/catalina/servlets/WebdavServlet.java | 8 +---
>> .../util/descriptor/web/SecurityConstraint.java | 8 ++--
>> java/org/apache/tomcat/util/http/Parameters.java | 7 +--
>> 6 files changed, 13 insertions(+), 49 deletions(-)
>> diff --git a/java/org/apache/catalina/connector/Request.java 
>> b/java/org/apache/catalina/connector/Request.java
>> index 40475e8fc5..b1f59767cc 100644
>> --- a/java/org/apache/catalina/connector/Request.java
>> +++ b/java/org/apache/catalina/connector/Request.java
>> @@ -3401,12 +3401,8 @@ public class Request implements HttpServletRequest {
>> for (AcceptLanguage acceptLanguage : acceptLanguages) {
>> // Add a new Locale to the list of Locales for this quality level
>> Double key = Double.valueOf(-acceptLanguage.getQuality()); // Reverse the 
>> order
>> - ArrayList values = locales.get(key);
>> - if (values == null) {
>> - values = new ArrayList<>();
>> - locales.put(key, values);
>> - }
>> - values.add(acceptLanguage.getLocale());
>> + locales.computeIfAbsent(key, k -> new ArrayList<>())
>> + .add(acceptLanguage.getLocale());
> 
> It probably isn't documented anywhere apart from in an old post somewhere in 
> dev@ archives but these days we use 120 characters as the line length limit 
> for code. Comments (for reasons I forget that may not even be valid any more) 
> are usually limited to 80.
> 
> No need to amend these (but no objection either if you want to). Just 
> something to keep in mind for next time.
Done.

Thanks for your reminding. : )

Han

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


Re: [DISCUSS] EOL date for 8.5.x

2022-10-20 Thread Han Li


> 2022年10月20日 17:01,Rémy Maucherat  写道:
> 
> On Fri, Oct 7, 2022 at 11:28 AM Mark Thomas  > wrote:
>> 
>> Hi all,
>> 
>> I don't think there is a need to make a decision on this quickly, but
>> based on past experience and the current discussions about Jakarta EE 11
>> I think this is something we need to start thinking about.
>> 
>> Some key facts:
>> 
>> - Tomcat 7.0.x reached EOL on 31 March 2021
>> - EOL dates for major versions tend to be 3-4 years apart
>> - We aim to support 3 major versions in parallel - currently 8.5.x,
>> 9.0.x and 10.1.x.
>> - Tomcat 11 will implement Jakarta EE 11
>> - Current Jakarta EE discussions are around a release in ~1 year
>> - Ideally, Tomcat 8.5.x EOL would be just after Tomcat 11 is declared
>> stable
>> 
>> Based on the above I think EOL for 8.5.x should be either 31 March 2024
>> or 30 Sept 2024 depending on when we think Jakarta EE 11 will be released.
>> 
>> Jakarta EE releases have tendency to slip so I think the 30 Sept 2024 is
>> probably the more likely. However, it is much easier to delay an EOL
>> date than to bring to bring it forward so my current thinking is to
>> announce 31 March 2024 as the EOL date for 8.5.x and keep in mind that
>> we can extend that if we want to.
>> 
>> Thoughts?
> 
> My slides said Tomcat 8.5 will be EOL when Tomcat 11 is released, so
> it seems that was the plan all along.
> So easy +1 :)
> 
> About the exact date, I think it is ok to set a date even if Tomcat 11
> happens to slip, Tomcat 9.0 is there.
+1

 BTW, I'm fed up with the limitations of JDK7 and I am  looking forward to JDK8 
as the minimum version to be maintained, as soon as possible so that it's a bit 
easier when back-ported.  : P : P

Han

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


Re: November release round

2022-10-26 Thread Han Li



> 2022年10月25日 23:51,Mark Thomas  写道:
> 
> Hi all,
> 
> I've just seen the heads up from the OpenSSL project that there will be a 
> 3.0.7 release on 2022-12-01 that will address a critical vulnerability. We 
> won't know the details of the vulnerability until the release announcement. 
> Given that it may trigger a Tomcat Native release my current thinking is:
> 
> - prep for November releases as normal
> - review the OpenSSL issue once public
> - roll a Tomcat Native release if necessary
> - update to the new Tomcat Native release of there is one
> - roll the Tomcat releases
> 
> Do we want to pick up an updated migration tool as well?
Sure, I have merged the PR and so far everything seems to be OK, and it’s 
indeed faster.

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



Re: November release round

2022-11-01 Thread Han Li



> 2022年11月2日 00:19,Mark Thomas  写道:
> 
> I've just read the OpenSSL announcement. The issue has been downgraded to 
> critical but we are going to need to new Tomcat Native release. There are a 
> couple of stack overflow bugs in certificate verification so Tomcat could be 
> accepted via CLIENT-CERT.
> 
> Where are we on the migration tool. I haven't been following that closely. Is 
> the repo ready for a release?
Yes, I think it’s ready. ;)

Han
> 
> Mark
> 
> 
> On 25/10/2022 16:55, Rémy Maucherat wrote:
>> On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas  wrote:
>>> 
>>> Hi all,
>>> 
>>> I've just seen the heads up from the OpenSSL project that there will be
>>> a 3.0.7 release on 2022-12-01 that will address a critical
>>> vulnerability. We won't know the details of the vulnerability until the
>>> release announcement. Given that it may trigger a Tomcat Native release
>>> my current thinking is:
>>> 
>>> - prep for November releases as normal
>>> - review the OpenSSL issue once public
>>> - roll a Tomcat Native release if necessary
>>> - update to the new Tomcat Native release of there is one
>>> - roll the Tomcat releases
>>> 
>>> Do we want to pick up an updated migration tool as well?
>> Maybe, we're in the process of integrating a PR for the tool. The
>> submitter says it makes it run faster.
>> 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
> 


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



Re: [tomcat] branch main updated: Fix BZ 66330

2022-11-01 Thread Han Li



> 2022年11月2日 10:09,li...@apache.org 写道:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> lihan pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new ee4a1496dd Fix BZ 66330
> ee4a1496dd is described below
> 
> commit ee4a1496dd16dfc31142e69527dad496fb28276f
> Author: lihan 
> AuthorDate: Wed Nov 2 10:09:18 2022 +0800
> 
>Fix BZ 66330
Wrongly written, not 66330 but 66331.

Han
> 
>Fix a regression in refactoring for Stack on the SystemLogHandler which 
> caught incorrect exception.
> ---
> java/org/apache/tomcat/util/log/SystemLogHandler.java | 4 ++--
> webapps/docs/changelog.xml| 5 +
> 2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java 
> b/java/org/apache/tomcat/util/log/SystemLogHandler.java
> index 2293f349af..946d9d6d9b 100644
> --- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
> +++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
> @@ -20,7 +20,7 @@ import java.io.IOException;
> import java.io.PrintStream;
> import java.util.ArrayDeque;
> import java.util.Deque;
> -import java.util.EmptyStackException;
> +import java.util.NoSuchElementException;
> import java.util.Queue;
> import java.util.concurrent.ConcurrentLinkedQueue;
> 
> @@ -83,7 +83,7 @@ public class SystemLogHandler extends PrintStream {
> if (!reuse.isEmpty()) {
> try {
> log = reuse.remove();
> -} catch (EmptyStackException e) {
> +} catch (NoSuchElementException e) {
> log = new CaptureLog();
> }
> } else {
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index de46e2c392..319be06fe2 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -131,6 +131,11 @@
> Context was ignored and the default was always used.
> (markt)
>   
> +  
> +66331: Fix a regression in refactoring for 
> Stack
> +on the SystemLogHandler which caught incorrect 
> exception.
> +(lihan)
> +  
> 
>   
>   
> 
> 
> -
> 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: [VOTE] Release Apache Tomcat Native 2.0.2

2022-11-02 Thread Han Li



> 2022年11月3日 04:57,Mark Thomas  写道:
> 
> The key differences of version 2.0.2 compared to 2.0.1 are:
> 
> - Update the minimum supported version of LibreSSL to 3.5.2.
>  Based on a #13 provided by orbea.
> 
> - The windows binaries in this release have been built with OpenSSL
>  3.0.7
> 
> The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but can be 
> used with earlier versions as long as the APR/native connector is not used.
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 2.0.2 release is
> [ X] Stable, go ahead and release

Han
> [ ] Broken because of ...
> 
> Thanks,
> 
> Mark
> 
> 
> [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.2
> [2]
> https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=9fea6f69aca11c2a129c557934f9abb40ac4e732
> 
> -
> 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: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.5

2022-11-02 Thread Han Li



> 2022年11月2日 20:43,Mark Thomas  写道:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.5 is now
> available for voting.
> 
> The significant changes since 1.0.4 are:
> 
> - #37 narrow scope of javax.annotation conversion to Java EE. PR by
>  Danny Thomas
> - #36 Improve manifest handling and conversion performance. PR by Danny
>  Thomas.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.5/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1404/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.5
> d87e1ec7e67c8d61340111b796e3bb8179a6f0ba
> 
> The proposed 1.0.5 release is:
> 
> [ ] -1: Broken. Do not release because...
> [ X] +1: Acceptable. Go ahead and release.

Test pass with old j2ee sample on tomcat 10.1.x.

Han

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



Re: BZ 66294 - optionally disable some SecurityManager checks

2022-11-07 Thread Han Li



> 2022年11月8日 00:24,Mark Thomas  写道:
> 
> Hi,
> 
> BZ 66294 [1] highlights the performance impact in Tomcat of some additional 
> SecurityManager checks that were added to avoid AccessControlException when 
> using the EL API JAR outside of Tomcat.
> 
> Details of the performance impact are in the bug report.
> 
> I think we have a few options here.
> 
> 1. Assume Tomcat 11 will remove the SecurityManager. No nothing for now and 
> advise the reporter to move to Tomcat 11 when available.
> 
> 2. Do nothing.
> 
> 3. Disable this check by default and an option (it will have to be a system 
> property) to enable it.
> 
> 4. Something else.
> 
> Thoughts?
> 
> I am currently leaning towards 3 given that the performance impact is 
> noticeable and that the check isn't required in normal usage.
+1

Han
> 
> Mark
> 
> 
> [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=66294
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.2

2022-11-09 Thread Han Li



> 2022年11月10日 01:32,Mark Thomas  写道:
> 
> The proposed Apache Tomcat 10.1.2 release is now available for
> voting.
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> The notable changes compared to 10.1.1 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>  lambda expressions.
> 
> - Update the packaged version of the Apache Tomcat Native Library to
>  2.0.2 to pick up the Windows binaries built with with OpenSSL 3.0.7.
> 
> - Correct the date format used with the expires attribute of HTTP
>  cookies. A single space rather than a single dash should be used to
>  separate the day, month and year components to be compliant with RFC
>  6265.
> 
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.2/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1405
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.2
> 153506ba8aaabbafbf75b9084f5869e02f35facc
> 
> 
> The proposed 10.1.2 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 10.1.2

Tests pass with OpenSSL 3.0.7 and tc-native 2.0.2 on macOS 12.3.1.

Han

> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.69

2022-11-10 Thread Han Li



> 2022年11月10日 03:48,Rémy Maucherat  写道:
> 
> The proposed Apache Tomcat 9.0.69 release is now available for voting.
> 
> The notable changes compared to 9.0.68 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>   lambda expressions.
> 
> - Update the packaged version of the Apache Tomcat Native Library to
>   2.0.2 to pick up the Windows binaries built with with OpenSSL 3.0.7.
Hmm. No this change in 9.0.x.

Han
> 
> - Correct the date format used with the expires attribute of HTTP
>   cookies. A single space rather than a single dash should be used to
>   separate the day, month and year components to be compliant with RFC
>   6265.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.69/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1406
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.69
> cd5fd93c5df3699868ec39731f5a347450112299
> 
> The proposed 9.0.69 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 9.0.69
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.69

2022-11-10 Thread Han Li



> 2022年11月10日 03:48,Rémy Maucherat  写道:
> 
> The proposed Apache Tomcat 9.0.69 release is now available for voting.
> 
> The notable changes compared to 9.0.68 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>   lambda expressions.
> 
> - Update the packaged version of the Apache Tomcat Native Library to
>   2.0.2 to pick up the Windows binaries built with with OpenSSL 3.0.7.
> 
> - Correct the date format used with the expires attribute of HTTP
>   cookies. A single space rather than a single dash should be used to
>   separate the day, month and year components to be compliant with RFC
>   6265.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.69/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1406
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.69
> cd5fd93c5df3699868ec39731f5a347450112299
> 
> The proposed 9.0.69 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 9.0.69

Tests pass with OpenSSL 3.0.7 and tc-native-1.2.35 on macOS 12.3.1.

Han

> 
> Rémy
> 
> -
> 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: [tomcat] branch main updated: URI(String) can also throw an IAE

2022-11-16 Thread Han Li



> 2022年11月17日 00:19,ma...@apache.org 写道:
> 
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/main by this push:
> new a52538baad URI(String) can also throw an IAE
> a52538baad is described below
> 
> commit a52538baadbd355837526f00f3ecae0c33d23660
> Author: Mark Thomas 
> AuthorDate: Wed Nov 16 16:19:02 2022 +
> 
>URI(String) can also throw an IAE
> ---
> java/org/apache/catalina/startup/Bootstrap.java | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/java/org/apache/catalina/startup/Bootstrap.java 
> b/java/org/apache/catalina/startup/Bootstrap.java
> index 2f8999a829..461d54b304 100644
> --- a/java/org/apache/catalina/startup/Bootstrap.java
> +++ b/java/org/apache/catalina/startup/Bootstrap.java
> @@ -179,7 +179,7 @@ public final class Bootstrap {
> URL url = uri.toURL();
> repositories.add(new Repository(repository, 
> RepositoryType.URL));
> continue;
> -} catch (MalformedURLException | URISyntaxException e) {
> +} catch (IllegalArgumentException | MalformedURLException | 
> URISyntaxException e) {
I think that we can use URI#create factory method instead of manually invoke 
constructor so that we need only caught IAE.

Han
> // Ignore
> }
> 
> 
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.84

2022-11-16 Thread Han Li
I think that I encounter a problem, shown below:

org.apache.jasper.JasperException: Unable to compile class for JSP: 

An error occurred at line: [17] in the jsp file: [/jsp/include/foo.jsp]
System cannot be resolved
14:   See the License for the specific language governing permissions and
15:   limitations under the License.
16: 
17: --%><%= System.currentTimeMillis() %>


Stacktrace:

org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)

org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213)

org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:380)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:350)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:334)

org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597)

org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331)
javax.servlet.http.HttpServlet.service(HttpServlet.java:765)
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)

org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126)

org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)

Ant test show passes, but there are problems. (I downloaded 8.5.83 from the 
official website, then accessed example webapp
 and also have this problem). I don’t know JDT, but I tested again by upgrading 
ecj version to 4.25 and this 
problem was solved.


Han

> 2022年11月17日 00:03,Christopher Schultz  写道:
> 
> The proposed Apache Tomcat 8.5.84 release is now available for voting.
> 
> The notable changes compared to 8.5.83 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>   lambda expressions.
> 
> - Correct the date format used with the expires attribute of HTTP
>   cookies. A single space rather than a single dash should be used to
>   separate the day, month and year components to be compliant with RFC
>   6265.
> 
> - Update to Commons Daemon 1.3.2.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1407
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.84/
> 079a46c1c1e56b1743e752a44450469690880a56
> 
> The proposed 8.5.84 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.5.84 (stable)
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.84

2022-11-17 Thread Han Li


> 2022年11月17日 16:08,Mark Thomas  写道:
> 
> On 17/11/2022 04:04, Han Li wrote:
>> I think that I encounter a problem, shown below:
>> org.apache.jasper.JasperException: Unable to compile class for JSP:
>> An error occurred at line: [17] in the jsp file: [/jsp/include/foo.jsp]
>> System cannot be resolved
>> 14: See the License for the specific language governing permissions and
>> 15: limitations under the License.
>> 16:
>> 17: --%><%= System.currentTimeMillis() %>
>> Stacktrace:
>>  
>> org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)
>>  
>> org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213)
>>  
>> org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:380)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:350)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:334)
>>  
>> org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597)
>>  
>> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398)
>>  org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383)
>>  org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331)
>>  javax.servlet.http.HttpServlet.service(HttpServlet.java:765)
>>  org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
>>  
>> org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126)
>>  
>> org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)
>> Ant test show passes, but there are problems. (I downloaded 8.5.83 from the 
>> official website, then accessed example webapp
>> and also have this problem). I don’t know JDT, but I tested again by 
>> upgrading ecj version to 4.25 and this
>> problem was solved.
> 
> I can't repeat this.
> 
> I downloaded the 8.5.84 RC and then tested with Oracle JDK 1.7.0_80. The JSP 
> include example worked.
> 
> I then cleared out the work directory, switched to Temurin JDK 11.0.17_08 and 
> tested the JSP include example. That worked too.
> 
> I made no changes to the Eclipse compiler JAR.
> 
> Can you provide the exact steps to recreate the issue from a clean 8.5.84 
> download?
Mark,

My env is JDK 17.0.2, that not worked.

After your reminder, I just switched to 1.8.0_271, that also worked.



Han
> 
> Mark
> 
> 
>> Han
>>> 2022年11月17日 00:03,Christopher Schultz  写道:
>>> 
>>> The proposed Apache Tomcat 8.5.84 release is now available for voting.
>>> 
>>> The notable changes compared to 8.5.83 are:
>>> 
>>> - Fix concurrency issue in evaluation of expression language containing
>>> lambda expressions.
>>> 
>>> - Correct the date format used with the expires attribute of HTTP
>>> cookies. A single space rather than a single dash should be used to
>>> separate the day, month and year components to be compliant with RFC
>>> 6265.
>>> 
>>> - Update to Commons Daemon 1.3.2.
>>> 
>>> Along with lots of other bug fixes and improvements.
>>> 
>>> For full details, see the changelog:
>>> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
>>> 
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/
>>> 
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1407
>>> 
>>> The tag is:
>>> https://github.com/apache/tomcat/tree/8.5.84/
>>> 079a46c1c1e56b1743e752a44450469690880a56
>>> 
>>> The proposed 8.5.84 release is:
>>> [ ] Broken - do not release
>>> [ ] Stable - go ahead and release as 8.5.84 (stable)
>>> 
>>> -
>>> 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 
>> <mailto:dev-unsubscr...@tomcat.apache.org>
>> For additional commands, e-mail: dev-h...@tomcat.apache.org 
>> <mailto:dev-h...@tomcat.apache.org>
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [VOTE] Release Apache Tomcat 8.5.84

2022-11-17 Thread Han Li


> 2022年11月17日 16:08,Mark Thomas  写道:
> 
> On 17/11/2022 04:04, Han Li wrote:
>> I think that I encounter a problem, shown below:
>> org.apache.jasper.JasperException: Unable to compile class for JSP:
>> An error occurred at line: [17] in the jsp file: [/jsp/include/foo.jsp]
>> System cannot be resolved
>> 14: See the License for the specific language governing permissions and
>> 15: limitations under the License.
>> 16:
>> 17: --%><%= System.currentTimeMillis() %>
>> Stacktrace:
>>  
>> org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)
>>  
>> org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213)
>>  
>> org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:380)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:350)
>>  org.apache.jasper.compiler.Compiler.compile(Compiler.java:334)
>>  
>> org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597)
>>  
>> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398)
>>  org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383)
>>  org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331)
>>  javax.servlet.http.HttpServlet.service(HttpServlet.java:765)
>>  org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
>>  
>> org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126)
>>  
>> org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)
>> Ant test show passes, but there are problems. (I downloaded 8.5.83 from the 
>> official website, then accessed example webapp
>> and also have this problem). I don’t know JDT, but I tested again by 
>> upgrading ecj version to 4.25 and this
>> problem was solved.
> 
> I can't repeat this.
> 
> I downloaded the 8.5.84 RC and then tested with Oracle JDK 1.7.0_80. The JSP 
> include example worked.
> 
> I then cleared out the work directory, switched to Temurin JDK 11.0.17_08 and 
> tested the JSP include example. That worked too.
> 
> I made no changes to the Eclipse compiler JAR.
> 
> Can you provide the exact steps to recreate the issue from a clean 8.5.84 
> download?

There are no exact steps, just need to simply access this url:
http://localhost:8080/examples/jsp/include/foo.jsp

Han
> 
> Mark
> 
> 
>> Han
>>> 2022年11月17日 00:03,Christopher Schultz  写道:
>>> 
>>> The proposed Apache Tomcat 8.5.84 release is now available for voting.
>>> 
>>> The notable changes compared to 8.5.83 are:
>>> 
>>> - Fix concurrency issue in evaluation of expression language containing
>>> lambda expressions.
>>> 
>>> - Correct the date format used with the expires attribute of HTTP
>>> cookies. A single space rather than a single dash should be used to
>>> separate the day, month and year components to be compliant with RFC
>>> 6265.
>>> 
>>> - Update to Commons Daemon 1.3.2.
>>> 
>>> Along with lots of other bug fixes and improvements.
>>> 
>>> For full details, see the changelog:
>>> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
>>> 
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/
>>> 
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1407
>>> 
>>> The tag is:
>>> https://github.com/apache/tomcat/tree/8.5.84/
>>> 079a46c1c1e56b1743e752a44450469690880a56
>>> 
>>> The proposed 8.5.84 release is:
>>> [ ] Broken - do not release
>>> [ ] Stable - go ahead and release as 8.5.84 (stable)
>>> 
>>> -
>>> 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 
>> <mailto:dev-unsubscr...@tomcat.apache.org>
>> For additional commands, e-mail: dev-h...@tomcat.apache.org 
>> <mailto:dev-h...@tomcat.apache.org>
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org 
> <mailto:dev-unsubscr...@tomcat.apache.org>
> For additional commands, e-mail: dev-h...@tomcat.apache.org 
> <mailto:dev-h...@tomcat.apache.org>


Re: [VOTE] Release Apache Tomcat 8.5.84

2022-11-17 Thread Han Li



> 2022年11月17日 17:52,Mark Thomas  写道:
> 
> On 17/11/2022 08:23, Han Li wrote:
>>> 2022年11月17日 16:08,Mark Thomas  写道:
>>> 
>>> On 17/11/2022 04:04, Han Li wrote:
>>>> I think that I encounter a problem, shown below:
>>>> org.apache.jasper.JasperException: Unable to compile class for JSP:
>>>> An error occurred at line: [17] in the jsp file: [/jsp/include/foo.jsp]
>>>> System cannot be resolved
>>>> 14: See the License for the specific language governing permissions and
>>>> 15: limitations under the License.
>>>> 16:
>>>> 17: --%><%= System.currentTimeMillis() %>
>>>> Stacktrace:
>>>>
>>>> org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:102)
>>>>
>>>> org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:213)
>>>>
>>>> org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:589)
>>>>org.apache.jasper.compiler.Compiler.compile(Compiler.java:380)
>>>>org.apache.jasper.compiler.Compiler.compile(Compiler.java:350)
>>>>org.apache.jasper.compiler.Compiler.compile(Compiler.java:334)
>>>>
>>>> org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:597)
>>>>
>>>> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:398)
>>>>org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:383)
>>>>org.apache.jasper.servlet.JspServlet.service(JspServlet.java:331)
>>>>javax.servlet.http.HttpServlet.service(HttpServlet.java:765)
>>>>org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
>>>>
>>>> org.apache.catalina.filters.HttpHeaderSecurityFilter.doFilter(HttpHeaderSecurityFilter.java:126)
>>>>
>>>> org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:109)
>>>> Ant test show passes, but there are problems. (I downloaded 8.5.83 from 
>>>> the official website, then accessed example webapp
>>>> and also have this problem). I don’t know JDT, but I tested again by 
>>>> upgrading ecj version to 4.25 and this
>>>> problem was solved.
>>> 
>>> I can't repeat this.
>>> 
>>> I downloaded the 8.5.84 RC and then tested with Oracle JDK 1.7.0_80. The 
>>> JSP include example worked.
>>> 
>>> I then cleared out the work directory, switched to Temurin JDK 11.0.17_08 
>>> and tested the JSP include example. That worked too.
>>> 
>>> I made no changes to the Eclipse compiler JAR.
>>> 
>>> Can you provide the exact steps to recreate the issue from a clean 8.5.84 
>>> download?
>> There are no exact steps, just need to simply access this url:
>> http://localhost:8080/examples/jsp/include/foo.jsp
> 
> The Java version was the key.
> 
> Eclispe JDT 4.6.3 can't compile JSPs under Java 17 as it can't read the Java 
> 17 class files.
> 
> We can't update JDT as that is the latest version that works with Java 7 and 
> Tomcat 8.x has a (specification mandated) minimum Java version of 7.
> 
> Updating the JDT locally, as you found, is the way to work around this 
> problem.

Got it.

In that case, I think we need to mark the upper limit of JDK version on 
documentation for 8.5.x.

Han

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



Re: [VOTE] Release Apache Tomcat 8.5.84

2022-11-17 Thread Han Li



> 2022年11月17日 00:03,Christopher Schultz  写道:
> 
> The proposed Apache Tomcat 8.5.84 release is now available for voting.
> 
> The notable changes compared to 8.5.83 are:
> 
> - Fix concurrency issue in evaluation of expression language containing
>   lambda expressions.
> 
> - Correct the date format used with the expires attribute of HTTP
>   cookies. A single space rather than a single dash should be used to
>   separate the day, month and year components to be compliant with RFC
>   6265.
> 
> - Update to Commons Daemon 1.3.2.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.84/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1407
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.84/
> 079a46c1c1e56b1743e752a44450469690880a56
> 
> The proposed 8.5.84 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 8.5.84 (stable)

Han
> 
> -
> 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: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.6

2022-12-02 Thread Han Li



> On Dec 2, 2022, at 18:24, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.6 is now
> available for voting.
> 
> The significant changes since 1.0.5 are:
> 
> - Correct regression in handling of javax.annotation package introduced
>  in 1.0.5. PR provided by Danny Thomas.
> 
> - Allow parallel use of ClassConverter. PR provided by Danny Thomas.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.6/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1411/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.6
> 3339fc418974bd5ce3432ea9503abda52d96a435
> 
> The proposed 1.0.6 release is:
> 
> [ ] -1: Broken. Do not release because…
> [X ] +1: Acceptable. Go ahead and release.

Han
> 
> Thanks,
> 
> 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



Re: [VOTE] Release Apache Tomcat 9.0.70

2022-12-02 Thread Han Li



> On Dec 1, 2022, at 22:27, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.70 release is now available for voting.
> 
> The notable changes compared to 9.0.69 are:
> 
> - When an HTTP/2 stream was reset, the current active stream count was
>   not reduced. If enough resets occurred on a connection, the current
>   active stream count limit was reached and no new streams could be
>   created on that connection.
> 
> - Update to Commons Daemon 1.3.3
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.70/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1410
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.70
> 55a52d8475b8b3ec8ebda739f8c6b4fdeac173d9
> 
> The proposed 9.0.70 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 9.0.70

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M1

2022-12-02 Thread Han Li



> On Dec 1, 2022, at 19:58, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M1 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M1 is the first milestone release of the 11.0.x
> branch and has been made to provide users with early access to the new
> features in Apache Tomcat 11.0.x so that they may provide feedback. The
> notable changes compared to 10.1.x include:
> 
> - Alignment with the current development versions of the Jakarta
>  Servlet, Pages and Expression Language specifications. This includes
>  removal of deprecated code and addition of the
>  jakarta.servlet.error.query_string attribute for error dispatches
> 
> - BASIC authentication now uses UTF-8 by default
> 
> - Conversions from bytes to characters now trigger exceptions rather
>  than replacement for invalid byte sequences for the given encoding
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M1/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1408
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M1
> 59c81e30e2f64f5e8c1db78c4860c51850dfb0bd
> 
> The proposed 11.0.0-M1 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 11.0.0-M1

Tests pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.4

2022-12-06 Thread Han Li



> On Dec 6, 2022, at 01:42, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 10.1.4 release is now available for
> voting.
> 
> The notable changes compared to 10.1.2 are:
> 
> - Refactor WebappLoader so it only has a runtime dependency on the
>  migration tool for Jakarta EE if configured to use the converter as
>  classes are loaded.
> 
> - When an HTTP/2 stream was reset, the current active stream count was
>  not reduced. If enough resets occurred on a connection, the current
>  active stream count limit was reached and no new streams could be
>  created on that connection.
> 
> - Update to Commons Daemon 1.3.3
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.4/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1412
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.4
> a8e13f8d7e621be9f58af45f5a67e7bf847a8321
> 
> 
> The proposed 10.1.4 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 10.1.4

Tests pass with tc-native 2.0.2 and OpenSSL 3.0.7 on macOS 12.3.1.

Han
> 
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M2

2023-01-10 Thread Han Li



> On Jan 10, 2023, at 02:20, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M2 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M2 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Add ByteBuffer support to ServletInputStream and ServletOutputStream
> 
> - Update Cookie parsing and handling to treat the quotes in a quoted
>  cookie value as part of the value as required by RFC 6265 and
>  explicitly clarified in RFC 6265bis.
> 
> - When resetting an HTTP/2 stream because the final response has been
>  generated before the request has been fully read, use the HTTP/2 error
>  code NO_ERROR so that client does not discard the response. Based on a
>  suggestion by Lorenzo Dalla Vecchia.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M2/
> 4b03c23ad60e678c1d1a85df815fb6cd8d14ca67
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1413
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M2
> 
> 
> The proposed 11.0.0-M2 release is:
> [ ] Broken - do not release
> [X ]Alpha - go ahead and release as 11.0.0-M2

Tests pass with tc-native 2.0.2 and OpenSSL 3.0.7 on macOS 12.3.1.

Han

> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.5

2023-01-10 Thread Han Li



> On Jan 10, 2023, at 04:25, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 10.1.5 release is now available for
> voting.
> 
> The notable changes compared to 10.1.4 are:
> 
> - Correct a regression in the refactoring that replaced the use of the
>  URL constructors. The regression broke lookups for resources that
>  contained one or more characters in their name that required escaping
>  when used in a URI path.
> 
> - When resetting an HTTP/2 stream because the final response has been
>  generated before the request has been fully read, use the HTTP/2 error
>  code NO_ERROR so that client does not discard the response. Based on a
>  suggestion by Lorenzo Dalla Vecchia.
> 
> - Change the default of the org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED
>  system property to true unless the EL library is running on Tomcat in
>  which case the default remains false as the EL library is already
>  called from within a privileged block and skipping the unnecessary
>  privileged block improves performance.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.5/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1414
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.5
> f6eebe2ef959503150432dc2700181bd29a5ebc9
> 
> 
> The proposed 10.1.5 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 10.1.5


Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.71

2023-01-11 Thread Han Li



> On Jan 10, 2023, at 06:53, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.71 release is now available for voting.
> 
> The notable changes compared to 9.0.70 are:
> 
> - Correct a regression in the refactoring that replaced the use of the
>   URL constructors. The regression broke lookups for resources that
>   contained one or more characters in their name that required escaping
>   when used in a URI path.
> 
> - When resetting an HTTP/2 stream because the final response has been
>   generated before the request has been fully read, use the HTTP/2 error
>   code NO_ERROR so that client does not discard the response. Based on a
>   suggestion by Lorenzo Dalla Vecchia.
> 
> - Change the default of the org.apache.el.GET_CLASSLOADER_USE_PRIVILEGED
>   system property to true unless the EL library is running on Tomcat in
>   which case the default remains false as the EL library is already
>   called from within a privileged block and skipping the unnecessary
>   privileged block improves performance.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.71/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1415
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.71
> 83ff421c4725bccfd7bec1a16b8ca3cb61bedd2a
> 
> The proposed 9.0.71 release is:
> [ ] Broken - do not release
> [ X] Stable - go ahead and release as 9.0.71

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M12

2023-10-09 Thread Han Li



> On Oct 10, 2023, at 05:42, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M12 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M12 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Provide a lifecycle listener that will automatically
>  reload TLS configurations a set time before the certificate is due to
>  expire. This is intended to be used with third-party tools that
>  regularly renew TLS certificates.
> 
> - Remove support for HTTP/2 server push
> 
> - Update Tomcat Native to 2.0.6 to pick up Windows binaries built with
>  OpenSSL 3.0.11
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M12/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1456
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M12
> 5a67c7c58d8caf24969093e6423b7f0b43df2f6a
> 
> 
> The proposed 11.0.0-M12 release is:
> [ ] -1 Broken - do not release
> [X ] +1 Alpha  - go ahead and release as 11.0.0-M12

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.14

2023-10-09 Thread Han Li



> On Oct 10, 2023, at 06:18, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.14 release is now available for
> voting.
> 
> The notable changes compared to 10.1.13 are:
> 
> - Update Tomcat Native to 1.2.39 to pick up Windows binaries built with
>  OpenSSL 3.0.11.
> 
> - Provide a lifecycle listener that will automatically reload TLS
>  configurations a set time before the certificate is due to expire.
>  This is intended to be used with third-party tools that regularly
>  renew TLS certificates.
> 
> - Improve performance of EL expressions in JSPs that use implicit
>  objects.
> 
> - Several improvements to thread safety and recycling cleanup.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.14/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1459
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.14
> 5feba31fa86b38bd645bf9cc1ddee883ad7bc6a4
> 
> The proposed 10.1.14 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.14

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.81

2023-10-09 Thread Han Li



> On Oct 10, 2023, at 05:36, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.81 release is now available for voting.
> 
> The notable changes compared to 9.0.80 are:
> 
> - Provide a lifecycle listener that will automatically
>  reload TLS configurations a set time before the certificate is due to
>  expire. This is intended to be used with third-party tools that
>  regularly renew TLS certificates.
> 
> - Align validation of HTTP trailer fields with standard fields.
> 
> - Improvements to HTTP/2 overhead protection.
> 
> - Improve performance of EL expressions in JSPs that use
>  implicit objects.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.81/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1455
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.81
> 90a0120a60faf9a3a657b113a7e2cdda2112be91
> 
> The proposed 9.0.81 release is:
> [ ] -1, Broken - do not release
> [X ] +1, Stable - go ahead and release as 9.0.81

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.94

2023-10-09 Thread Han Li



> On Oct 10, 2023, at 05:55, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 8.5.94 release is now available for voting.
> 
> The notable changes compared to 8.5.93 are:
> 
> - Update Tomcat Native to 1.2.39 to pick up Windows binaries built with
>  OpenSSL 3.0.11.
> 
> - Provide a lifecycle listener that will automatically reload TLS
>  configurations a set time before the certificate is due to expire.
>  This is intended to be used with third-party tools that regularly
>  renew TLS certificates.
> 
> - Improve performance of EL expressions in JSPs that use implicit
>  objects.
> 
> - Several improvements to thread safety and recycling cleanup.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.94/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1436
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.94/
> 36d4f7d698f71cd322204a3b242a97c54860fb8c
> 
> The proposed 8.5.94 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.94 (stable)


Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.94 [CORRECTION]

2023-10-09 Thread Han Li
Christopher Schultz  于2023年10月10日周二 06:02写道:

> All,
>
> On 10/9/23 17:55, Christopher Schultz wrote:
> > The proposed Apache Tomcat 8.5.94 release is now available for voting.
> >
> > The notable changes compared to 8.5.93 are:
> >
> > - Update Tomcat Native to 1.2.39 to pick up Windows binaries built with
> >OpenSSL 3.0.11.
> >
> > - Provide a lifecycle listener that will automatically reload TLS
> >configurations a set time before the certificate is due to expire.
> >This is intended to be used with third-party tools that regularly
> >renew TLS certificates.
> >
> > - Improve performance of EL expressions in JSPs that use implicit
> >objects.
> >
> > - Several improvements to thread safety and recycling cleanup.
> >
> > Along with lots of other bug fixes and improvements.
> >
> > For full details, see the changelog:
> > https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> >
> > It can be obtained from:
> > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.94/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1436
>
> I had the Maven staging URL incorrect. Please use this one instead:
> https://repository.apache.org/content/repositories/orgapachetomcat-1457
>
> > The tag is:
> > https://github.com/apache/tomcat/tree/8.5.94/
> > 36d4f7d698f71cd322204a3b242a97c54860fb8c
> >
> > The proposed 8.5.94 release is:
> > [ ] Broken - do not release
> > [ X] Stable - go ahead and release as 8.5.94 (stable)
>

Han

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


Re: Re-tagging

2023-10-11 Thread Han Li



> On Oct 11, 2023, at 17:58, Mark Thomas  wrote:
> 
> Hi all,
> 
> Given the compression regression, how quickly do we want to re-tag? I should 
> be available to do 11.0.x pretty much whenever. I can help out with other 
> brnaches as well if required.

+1, I can wait  to test and vote for new version. : )

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



Re: [VOTE] Release Apache Tomcat 11.0.0-M13

2023-10-11 Thread Han Li
Mark Thomas  于2023年10月11日周三 21:25写道:

> The proposed Apache Tomcat 11.0.0-M13 release is now available for
> voting.
>
> Apache Tomcat 11.0.0-M13 is a milestone release of the 11.0.x branch and
> has been made to provide users with early access to the new features in
> Apache Tomcat 11.0.x so that they may provide feedback. The notable
> changes compared to the previous milestone include:
>
> - Correct a regression in 11.0.0-M12 that broke the Tomcat JBDC
>connection pool
>
> - Correct a regression in 11.0.0-M12 that broke HTTP compression
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory. Applications using deprecated APIs may require
> further changes.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M13/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1460
>
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M13
> de45b3f200602b98cde70debe7f656bef0bb5fa2
>
>
> The proposed 11.0.0-M13 release is:
> [ ] -1 Broken - do not release
> [ X] +1 Alpha  - go ahead and release as 11.0.0-M13
>

Tests pass.

Han


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

2023-10-11 Thread Han Li



> On Oct 11, 2023, at 21:38, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.82 release is now available for voting.
> 
> The notable changes compared to 9.0.81 are:
> 
> - Correct a regression in 9.0.81 that broke the Tomcat JBDC
>   connection pool
> 
> - Correct a regression in 9.0.81 that broke HTTP compression
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.82/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1461
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.82
> e3b341d78d8db0f74d8989412eb28cdc39b2c251
> 
> The proposed 9.0.82 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.82

Tests pass.

Han

> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.15

2023-10-11 Thread Han Li



> On Oct 12, 2023, at 08:50, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.15 release is now available for
> voting.
> 
> The notable changes compared to 10.1.14 are:
> 
> - Correct a regression in 10.1.14 that broke the Tomcat JBDC
>  connection pool
> 
> - Correct a regression in 10.1.14 that broke HTTP compression
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.15/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1462
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.15
> bd69455d3331a153c411b6f1ac5e434bed06f3ce
> 
> The proposed 10.1.15 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.15

Tests pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.95 [CORRECTED]

2023-10-12 Thread Han Li



> On Oct 12, 2023, at 09:32, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 8.5.95 release is now available for voting.
> 
> The notable changes compared to 8.5.94 are:
> 
> - Correct a regression in 8.5.94 that broke the Tomcat JBDC
>  connection pool
> 
> - Correct a regression in 8.5.94 that broke HTTP compression
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.95/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1463
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.95/
> 
> The proposed 8.5.95 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.95 (stable)
Tests pass.

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.16

2023-11-12 Thread Han Li
Christopher Schultz  于2023年11月11日周六 04:00写道:

> The proposed Apache Tomcat 10.1.16 release is now available for
> voting.
>
> The notable changes compared to 10.1.15 are:
>
> - Fix reloading TLS configuration could cause the Connector to
>refuse new connections or the JVM to crash.
>
> - Ensure that an IOException during the reading of the request
>triggers always error handling, regardless of whether the
>application swallows the exception.
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.16/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1467
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.16
> db45aa20e1686827aa49a9062c775d266ef061d7
>
> The proposed 10.1.16 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.16
>

Tests pass.

Han

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

-- 
Han Li


Re: [VOTE] Release Apache Tomcat 8.5.96

2023-11-12 Thread Han Li



> On Nov 11, 2023, at 04:04, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 8.5.96 release is now available for voting.
> 
> The notable changes compared to 8.5.95 are:
> 
> - Fix reloading TLS configuration could cause the Connector to
>  refuse new connections or the JVM to crash.
> 
> - Ensure that an IOException during the reading of the request
>  always triggers error handling, regardless of whether the
>  application swallows the exception.
> 
> - The status manager servlet can now output statistics as json.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.96/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1466
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.96/
> e9630c1fad9a72e7394872a2aeeb73627f821b6c
> 
> The proposed 8.5.96 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.96 (stable)

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.83

2023-11-12 Thread Han Li



> On Nov 10, 2023, at 06:12, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.83 release is now available for voting.
> 
> The notable changes compared to 9.0.82 are:
> 
> - Fix reloading TLS configuration could cause the Connector to
>   refuse new connections or the JVM to crash.
> 
> - Ensure that an IOException during the reading of the request
>   always triggers error handling, regardless of whether the
>   application swallows the exception.
> 
> - The status manager servlet can now output statistics as json.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.83/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1465
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.83
> be97b0e06e77226aea5eb2a7b448f1d53bda2aa1
> 
> The proposed 9.0.83 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.83

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M15

2023-12-10 Thread Han Li



> On Dec 7, 2023, at 23:36, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M15 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M15 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Background processes for a Container no longer execute while lifecycle
>  operations are in progress for that Container.
> 
> - Align with the latest additions and changes from the Servlet 6.1
>  specification.
> 
> - Update the sample.war included in the documentation to use the Jakarta
>  EE APIs.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M15/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1468
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M15
> a22029c7147b83e4fbced16add744903245d1147
> 
> 
> The proposed 11.0.0-M15 release is:
> [ ] -1 Broken - do not release
> [X] +1 Alpha  - go ahead and release as 11.0.0-M15

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 9.0.84

2023-12-10 Thread Han Li



> On Dec 8, 2023, at 03:44, Rémy Maucherat  wrote:
> 
> The proposed Apache Tomcat 9.0.84 release is now available for voting.
> 
> The notable changes compared to 9.0.83 are:
> 
> - Background processes for a Container no longer execute while lifecycle
>   operations are in progress for that Container.
> 
> - Correct unintended escaping of XML in some WebDAV responses.
> 
> - Use a 408 status code if a read timeout occurs during HTTP
>   HTTP request processing instead of an HTTP 400 status.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.84/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1470
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.84
> 064d432ca94c8340a2030a4eeb0566e94e87c683
> 
> The proposed 9.0.84 release is:
> [ ] -1, Broken - do not release
> [X] +1, Stable - go ahead and release as 9.0.84

Han
> 
> Rémy
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.17

2023-12-10 Thread Han Li



> On Dec 8, 2023, at 11:17, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.17 release is now available for
> voting.
> 
> The notable changes compared to 10.1.16 are:
> 
> - Background processes for a Container no longer execute while lifecycle
>  operations are in progress for that Container.
> 
> - Correct unintended escaping of XML in some WebDAV responses.
> 
> - Use a 408 status code if a read timeout occurs during HTTP
>  HTTP request processing instead of an HTTP 400 status.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.17/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1473
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.17
> 32e30a4648cdd24245ef4a0d58beb6ada1c41844
> 
> The proposed 10.1.17 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.17
Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 10.1.18

2024-01-08 Thread Han Li



> On Jan 5, 2024, at 23:25, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 10.1.18 release is now available for
> voting.
> 
> The notable changes compared to 10.1.17 are:
> 
> - Fix virtual thread support for the NIO2 connector.
> 
> - Correct a regression in the fix for 67675 that broke TLS key file
>  parsing for PKCS#8 format keys that do not specify an explicit
>  pseudo-random function and rely on the default. This typically affects
>  keys generated by OpenSSL 1.0.2.
> 
> - Allow multiple operations with the same name on introspected mbeans,
>  fixing a regression caused by the introduction of a second
>  addSslHostConfig() method.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.18/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1476
> 
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.18
> dd75fed1ae949455531e6a1aae55fb6ea7615786
> 
> The proposed 10.1.18 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 10.1.18

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.98

2024-01-08 Thread Han Li



> On Jan 6, 2024, at 00:53, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 8.5.98 release is now available for voting.
> 
> The notable changes compared to 8.5.97 are:
> 
> - Fix virtual thread support for the NIO2 connector.
> 
> - Correct a regression in the fix for 67675 that broke TLS key file
>  parsing for PKCS#8 format keys that do not specify an explicit
>  pseudo-random function and rely on the default. This typically affects
>  keys generated by OpenSSL 1.0.2.
> 
> - Allow multiple operations with the same name on introspected mbeans,
>  fixing a regression caused by the introduction of a second
>  addSslHostConfig() method.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.98/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1478
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.98/
> 8653b0fc34bdb2a673ec5c306b1a95a7d466eaf4
> 
> The proposed 8.5.98 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.98 (stable)

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 11.0.0-M16

2024-01-08 Thread Han Li



> On Jan 5, 2024, at 05:08, Mark Thomas  wrote:
> 
> The proposed Apache Tomcat 11.0.0-M16 release is now available for
> voting.
> 
> Apache Tomcat 11.0.0-M16 is a milestone release of the 11.0.x branch and has 
> been made to provide users with early access to the new features in Apache 
> Tomcat 11.0.x so that they may provide feedback. The notable changes compared 
> to the previous milestone include:
> 
> - Fix virtual thread support for the NIO2 connector
> 
> - Correct a regression in the fix for 67675 that broke TLS key file
>  parsing for PKCS#8 format keys that do not specify an explicit
>  pseudo-random function and rely on the default. This typically affects
>  keys generated by OpenSSL 1.0.2.
> 
> - Allow multiple operations with the same name on introspected mbeans,
>  fixing a regression caused by the introduction of a second
>  addSslHostConfig() method.
> 
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
> 
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 
> without changes. Java EE applications designed for Tomcat 9 and earlier may 
> be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
> automatically convert them to Jakarta EE and copy them to the webapps 
> directory. Applications using deprecated APIs may require further changes.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M16/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1474
> 
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M16
> ca6ea22e9b6c47df1db85e9af80f80431c3ea19e
> 
> 
> The proposed 11.0.0-M16 release is:
> [ ] -1 Broken - do not release
> [X] +1 Alpha  - go ahead and release as 11.0.0-M16

Han
> 
> -
> 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: [VOTE] Release Apache Tomcat 8.5.89

2023-05-17 Thread Han Li



> On May 10, 2023, at 01:38, Christopher Schultz  
> wrote:
> 
> The proposed Apache Tomcat 8.5.89 release is now available for voting.
> 
> The notable changes compared to 8.5.88 are:
> 
> - Many improvements to the JSON access log valve.
> 
> - Deprecate support for the HTTP Connector settings rejectIllegalHeader
>   and allowHostHeaderMismatch and reject HTTP headers without names.
> 
> - Add a RateLimitFilter which can be used to mitigate DoS and Brute
>   Force attacks.
> 
> Along with lots of other bug fixes and improvements.
> 
> For full details, see the changelog:
> https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.89/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1436
> 
> The tag is:
> https://github.com/apache/tomcat/tree/8.5.89/
> da91bd19ef2cb34a96e4ad04749dfc97c941db87
> 
> The proposed 8.5.89 release is:
> [ ] Broken - do not release
> [X ] Stable - go ahead and release as 8.5.88 (stable)
+1

Han
> 
> -
> 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: [tomcat] branch main updated: Clear SocketWrapper reference to help GC

2023-05-20 Thread Han Li


> On May 21, 2023, at 01:19, Mark Thomas  wrote:
> 
> On 19/05/2023 04:24, li...@apache.org  wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>> lihan pushed a commit to branch main
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git 
>> 
>> The following commit(s) were added to refs/heads/main by this push:
>> new 10492dd22b Clear SocketWrapper reference to help GC
>> 10492dd22b is described below
>> commit 10492dd22bd64ff63cf77786fa67d45cdc2a54b3
>> Author: lihan mailto:li...@apache.org>>
>> AuthorDate: Fri May 19 11:24:27 2023 +0800
>> Clear SocketWrapper reference to help GC
> 
> -1. Veto.
> 
>> ---
>> java/org/apache/coyote/AbstractProcessor.java | 3 +++
>> java/org/apache/coyote/http11/Http11Processor.java | 1 -
>> java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
> 
> The above changes need to be reverted since they break AJP connections. The 
> AJP processor is recycled after CPING MESSAGES and expects processing to 
> continue afterwards. Setting the SocketWrapper to null triggers NPEs when 
> trying to process the request that follows the CPING.

Sigh, I indeed forgot to test the AJP processor.

Have reverted, thanks for the review.

Han

> 
>> java/org/apache/tomcat/util/net/Nio2Channel.java | 1 +
>> java/org/apache/tomcat/util/net/NioChannel.java | 1 +
> 
> The above changes look to be OK although I'll note that they do add some 
> processing overhead.

> 
> Mark
> 
> 
>> 5 files changed, 6 insertions(+), 6 deletions(-)
>> diff --git a/java/org/apache/coyote/AbstractProcessor.java 
>> b/java/org/apache/coyote/AbstractProcessor.java
>> index 3ee6898fbd..8965dab62b 100644
>> --- a/java/org/apache/coyote/AbstractProcessor.java
>> +++ b/java/org/apache/coyote/AbstractProcessor.java
>> @@ -721,6 +721,9 @@ public abstract class AbstractProcessor extends 
>> AbstractProcessorLight implement
>> public void recycle() {
>> errorState = ErrorState.NONE;
>> asyncStateMachine.recycle();
>> + // Clear fields that can be cleared to aid GC and trigger NPEs if this
>> + // is reused
>> + socketWrapper = null;
>> }
>> diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
>> b/java/org/apache/coyote/http11/Http11Processor.java
>> index 9e2e74914c..85dfd34f3c 100644
>> --- a/java/org/apache/coyote/http11/Http11Processor.java
>> +++ b/java/org/apache/coyote/http11/Http11Processor.java
>> @@ -1418,7 +1418,6 @@ public class Http11Processor extends AbstractProcessor 
>> {
>> inputBuffer.recycle();
>> outputBuffer.recycle();
>> upgradeToken = null;
>> - socketWrapper = null;
>> sendfileData = null;
>> sslSupport = null;
>> }
>> diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
>> b/java/org/apache/coyote/http2/StreamProcessor.java
>> index 78cb770649..3b1c03ac38 100644
>> --- a/java/org/apache/coyote/http2/StreamProcessor.java
>> +++ b/java/org/apache/coyote/http2/StreamProcessor.java
>> @@ -392,8 +392,8 @@ class StreamProcessor extends AbstractProcessor {
>> @Override
>> public final void recycle() {
>> + super.recycle();
>> // StreamProcessor instances are not re-used.
>> -
>> // Calling removeRequestProcessor even though the RequestProcesser was
>> // never added will add the values from the RequestProcessor to the
>> // running total for the GlobalRequestProcessor
>> @@ -401,10 +401,6 @@ class StreamProcessor extends AbstractProcessor {
>> if (global != null) {
>> global.removeRequestProcessor(request.getRequestProcessor());
>> }
>> -
>> - // Clear fields that can be cleared to aid GC and trigger NPEs if this
>> - // is reused
>> - setSocketWrapper(null);
>> }
>> diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java 
>> b/java/org/apache/tomcat/util/net/Nio2Channel.java
>> index 603c43f416..9d65266374 100644
>> --- a/java/org/apache/tomcat/util/net/Nio2Channel.java
>> +++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
>> @@ -79,6 +79,7 @@ public class Nio2Channel implements 
>> AsynchronousByteChannel {
>> @Override
>> public void close() throws IOException {
>> sc.close();
>> + reset(this.sc, null);
>> }
>> diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
>> b/java/org/apache/tomcat/util/net/NioChannel.java
>> index d263ce9ae6..eae3f51171 100644
>> --- a/java/org/apache/tomcat/util/net/NioChannel.java
>> +++ b/java/org/apache/tomcat/util/net/NioChannel.java
>> @@ -81,6 +81,7 @@ public class NioChannel implements ByteChannel, 
>> ScatteringByteChannel, Gathering
>> @Override
>> public void close() throws IOException {
>> sc.close();
>> + reset(this.sc,null);
>> }
>> /**
>> -
>> 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 
> 

Re: Timing for June releases

2023-05-24 Thread Han Li



> On May 24, 2023, at 16:28, Mark Thomas  wrote:
> 
> Hi all,
> 
> OpenSSL has just announced a security fix release for 30 May.
> 
> We won't know what the security issues are until then so my tentative plan is 
> to tag and release Native 1.2.x and 2.0.x on 31 May, release Native 1.2.x and 
> 2.0.x relatively quickly, update all Tomcat versions to use the new Native 
> versions and then start the June releases.
> 
> Thoughts?
+1
> 
> 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



Re: [VOTE] Release Apache Tomcat Native 2.0.4

2023-05-31 Thread Han Li



> On May 31, 2023, at 04:58, Mark Thomas  wrote:
> 
> The key differences of version 2.0.4 compared to 2.0.3 are:
> 
> - The windows binaries in this release have been built with OpenSSL
>  3.0.9 and APR 1.7.4
> 
> The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but can be 
> used with earlier versions as long as the APR/native connector is not used.
> 
> The proposed release artifacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 2.0.4 release is
> [X] Stable, go ahead and release
> [ ] Broken because of ...
+1

Han
> 
> Thanks,
> 
> Mark
> 
> 
> [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.4
> [2] 
> https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=2f080011a624527420c202331c0eb4880c7cc035
> 
> -
> 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



  1   2   >