Re: Tagging mod_jk

[Martin Knoblauch]

Hi Mark,

 is there a Changelog available?

Thanks
Martin

On Wed, Sep 6, 2023 at 4:29 PM Mark Thomas  wrote:

> Hi all,
>
> After a long period of inactivity we have had some bug fixes for mod_jk
> so I am planning a Tomcat Connectors tag shortly.
>
> I need to run through my pre-tag checks and I'll tag after that -
> hopefully in a couple of hours.
>
> If you have any final changes for Tomcat Connectors now is the time to
> commit them or let me know to delay the tag.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
--
Martin Knoblauch
email: k n o b i AT knobisoft DOT de
www: http://www.knobisoft.de

Re: Tagging mod_jk

[Rainer Jung]

Should have gone to the list.

I think the mod_jk build process does not make it available online like 
the Tomcat one does, but here's the current section:



 Changes between 1.2.48 and 1.2.49


   Apache

 * Update: Retrieve default request id from mod_unique_id. It can also
   be taken from an arbitrary environment variable by configuring
   "JkRequestIdIndicator". (rjung)
 * Fix: 65901 :
   Don't delegate the generatation of the response body to httpd when
   the status code represents an error if the request used the HEAD
   method. (markt)
 * Fix: 66005 :
   Only export the main module symbol. Visibility of module internal
   symbols led to crashes when conflicting with library symbols. Based
   on a patch provided by Josef Čejka. (rjung)


   IIS

 * Update: Set default request id as a GUID. It can also be taken from
   an arbitrary request header by configuring "request_id_header". (rjung)
 * Fix: Fix non-empty check for the Translate header. (rjung)


   Common

 * Fix: Fix compiler warning when initializing and copying fixed length
   strings. (rjung)
 * Update: Add a request id to mod_jk log lines. (rjung)
 * Fix: 64878 :
   Enable configure to find the correct sizes for pid_t and pthread_t
   when building on MacOS. (markt)
 * Fix: Fix Clang 15/16 compatability. Pull request #6
    provided by Sam
   James. (markt)
 * Update: Improve XSS hardening in status worker. (rjung)


   Docs

 * Update: Remove support for the Netscape / Sun ONE / Oracle iPlanet
   Web Server as the product has been retired. (markt)
 * Update: Remove links to the old JK2 documentation. The JK2
   documentation is still available, it is just no longer linked from
   the current JK documentation. (markt)
 * Update: Restructure subsections in changelog starting with version
   1.2.45. (rjung)

Best regards,
Rainer

Am 07.09.23 um 09:43 schrieb Martin Knoblauch:

Hi Mark,

  is there a Changelog available?

Thanks
Martin

On Wed, Sep 6, 2023 at 4:29 PM Mark Thomas  wrote:


Hi all,

After a long period of inactivity we have had some bug fixes for mod_jk
so I am planning a Tomcat Connectors tag shortly.

I need to run through my pre-tag checks and I'll tag after that -
hopefully in a couple of hours.

If you have any final changes for Tomcat Connectors now is the time to
commit them or let me know to delay the tag.

Mark

[tomcat] branch main updated: Avoid possible NPE

[remm]

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 26272b8ad4 Avoid possible NPE
26272b8ad4 is described below

commit 26272b8ad49763466eed67b29a6183a70114acc5
Author: remm 
AuthorDate: Thu Sep 7 11:33:09 2023 +0200

Avoid possible NPE

The handling of an error accessing the descriptor was inconsistent.
Found by coverity.
---
 java/org/apache/catalina/startup/HostConfig.java | 4 ++--
 webapps/docs/changelog.xml   | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 7b10f5c494..a9246908c2 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -541,9 +541,9 @@ public class HostConfig implements LifecycleListener {
 boolean isExternal = false;
 File expandedDocBase = null;
 
-try (FileInputStream fis = new FileInputStream(contextXml)) {
+try {
 synchronized (digesterLock) {
-try {
+try (FileInputStream fis = new FileInputStream(contextXml)) {
 context = (Context) digester.parse(fis);
 } catch (Exception e) {
 
log.error(sm.getString("hostConfig.deployDescriptor.error", 
contextXml.getAbsolutePath()), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7962aeea93..8da3c35acf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix handling of an error reading a context descriptor on deployment.
+(remm)
+  
+
+  
 
 
   


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

[tomcat] branch 10.1.x updated: Avoid possible NPE

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 5c3e4730be Avoid possible NPE
5c3e4730be is described below

commit 5c3e4730be7cd1783b71c3f09203e4d7f4aa733f
Author: remm 
AuthorDate: Thu Sep 7 11:33:09 2023 +0200

Avoid possible NPE

The handling of an error accessing the descriptor was inconsistent.
Found by coverity.
---
 java/org/apache/catalina/startup/HostConfig.java | 4 ++--
 webapps/docs/changelog.xml   | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index fd3c77d290..001beb5ae2 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -577,9 +577,9 @@ public class HostConfig implements LifecycleListener {
 boolean isExternal = false;
 File expandedDocBase = null;
 
-try (FileInputStream fis = new FileInputStream(contextXml)) {
+try {
 synchronized (digesterLock) {
-try {
+try (FileInputStream fis = new FileInputStream(contextXml)) {
 context = (Context) digester.parse(fis);
 } catch (Exception e) {
 
log.error(sm.getString("hostConfig.deployDescriptor.error", 
contextXml.getAbsolutePath()), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7d7733fbce..72bff93758 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix handling of an error reading a context descriptor on deployment.
+(remm)
+  
+
+  
 
 
   


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

[tomcat] branch 9.0.x updated: Avoid possible NPE

[remm]

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 3189da5d00 Avoid possible NPE
3189da5d00 is described below

commit 3189da5d001c1ebecea51dbb7822a482d9ecd981
Author: remm 
AuthorDate: Thu Sep 7 11:33:09 2023 +0200

Avoid possible NPE

The handling of an error accessing the descriptor was inconsistent.
Found by coverity.
---
 java/org/apache/catalina/startup/HostConfig.java | 4 ++--
 webapps/docs/changelog.xml   | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index 79eb649ab1..3bc526b452 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -625,9 +625,9 @@ public class HostConfig implements LifecycleListener {
 boolean isExternal = false;
 File expandedDocBase = null;
 
-try (FileInputStream fis = new FileInputStream(contextXml)) {
+try {
 synchronized (digesterLock) {
-try {
+try (FileInputStream fis = new FileInputStream(contextXml)) {
 context = (Context) digester.parse(fis);
 } catch (Exception e) {
 
log.error(sm.getString("hostConfig.deployDescriptor.error", 
contextXml.getAbsolutePath()), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3e51f63466..2770320618 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix handling of an error reading a context descriptor on deployment.
+(remm)
+  
+
+  
 
 
   


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

[tomcat] branch 8.5.x updated: Avoid possible NPE

[remm]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new b8f935815b Avoid possible NPE
b8f935815b is described below

commit b8f935815b88a8c8afc77e7e77291bbc1c3f38d9
Author: remm 
AuthorDate: Thu Sep 7 11:33:09 2023 +0200

Avoid possible NPE

The handling of an error accessing the descriptor was inconsistent.
Found by coverity.
---
 java/org/apache/catalina/startup/HostConfig.java | 4 ++--
 webapps/docs/changelog.xml   | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java 
b/java/org/apache/catalina/startup/HostConfig.java
index eb70708349..56b8c17570 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -625,9 +625,9 @@ public class HostConfig implements LifecycleListener {
 boolean isExternal = false;
 File expandedDocBase = null;
 
-try (FileInputStream fis = new FileInputStream(contextXml)) {
+try {
 synchronized (digesterLock) {
-try {
+try (FileInputStream fis = new FileInputStream(contextXml)) {
 context = (Context) digester.parse(fis);
 } catch (Exception e) {
 
log.error(sm.getString("hostConfig.deployDescriptor.error", 
contextXml.getAbsolutePath()), e);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ae55fbbf45..0d08a0b809 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Fix handling of an error reading a context descriptor on deployment.
+(remm)
+  
+
+  
 
 
   


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

Re: Tagging mod_jk

[Martin Knoblauch]

On Thu, Sep 7, 2023 at 10:05 AM Rainer Jung  wrote:

> Should have gone to the list.
>
> I think the mod_jk build process does not make it available online like
> the Tomcat one does, but here's the current section:
>
>
>   Changes between 1.2.48 and 1.2.49
>
>
> Apache
>
>   * Update: Retrieve default request id from mod_unique_id. It can also
> be taken from an arbitrary environment variable by configuring
> "JkRequestIdIndicator". (rjung)
>   * Fix: 65901 :
> Don't delegate the generatation of the response body to httpd when
> the status code represents an error if the request used the HEAD
> method. (markt)
>   * Fix: 66005 :
> Only export the main module symbol. Visibility of module internal
> symbols led to crashes when conflicting with library symbols. Based
> on a patch provided by Josef Čejka. (rjung)
>
>
> IIS
>
>   * Update: Set default request id as a GUID. It can also be taken from
> an arbitrary request header by configuring "request_id_header". (rjung)
>   * Fix: Fix non-empty check for the Translate header. (rjung)
>
>
> Common
>
>   * Fix: Fix compiler warning when initializing and copying fixed length
> strings. (rjung)
>   * Update: Add a request id to mod_jk log lines. (rjung)
>   * Fix: 64878 :
> Enable configure to find the correct sizes for pid_t and pthread_t
> when building on MacOS. (markt)
>   * Fix: Fix Clang 15/16 compatability. Pull request #6
>  provided by Sam
> James. (markt)
>   * Update: Improve XSS hardening in status worker. (rjung)
>
>
> Docs
>
>   * Update: Remove support for the Netscape / Sun ONE / Oracle iPlanet
> Web Server as the product has been retired. (markt)
>   * Update: Remove links to the old JK2 documentation. The JK2
> documentation is still available, it is just no longer linked from
> the current JK documentation. (markt)
>   * Update: Restructure subsections in changelog starting with version
> 1.2.45. (rjung)
>
> Best regards,
> Rainer
>
> Am 07.09.23 um 09:43 schrieb Martin Knoblauch:
> > Hi Mark,
> >
> >   is there a Changelog available?
> >
> > Thanks
> > Martin
> >
> > On Wed, Sep 6, 2023 at 4:29 PM Mark Thomas  wrote:
> >
> >> Hi all,
> >>
> >> After a long period of inactivity we have had some bug fixes for mod_jk
> >> so I am planning a Tomcat Connectors tag shortly.
> >>
> >> I need to run through my pre-tag checks and I'll tag after that -
> >> hopefully in a couple of hours.
> >>
> >> If you have any final changes for Tomcat Connectors now is the time to
> >> commit them or let me know to delay the tag.
> >>
> >> Mark
> >>


Hi Rainer,

 thanks

Martin
-- 
--
Martin Knoblauch
email: k n o b i AT knobisoft DOT de
www: http://www.knobisoft.de

[tomcat-connectors] branch main updated (3ad622409 -> 963347be0)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


from 3ad622409 Skip the menu when processing news into text
 new b9af887a0 Updates paths
 new 1eb1858a3 Update CMCS version info
 new 963347be0 Update version for next development cycle

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 HOWTO-RELEASE.txt   | 12 ++--
 native/configure.ac |  2 +-
 native/iis/README   | 18 +-
 tools/dist/README.html  |  6 +++---
 tools/dist/binaries/windows/README.html |  2 +-
 xdocs/build.xml |  2 +-
 xdocs/miscellaneous/changelog.xml   |  2 ++
 7 files changed, 23 insertions(+), 21 deletions(-)


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

[tomcat-connectors] 02/03: Update CMCS version info

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1eb1858a3f7aed64963f2e2c40dfef1668501e00
Author: Mark Thomas 
AuthorDate: Thu Sep 7 13:24:04 2023 +0100

Update CMCS version info
---
 native/iis/README | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index 385aea3bd..d01e18383 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -13,8 +13,8 @@ environment:
 
 - Git client
 - Mladen's Custom Microsoft Compiler Toolkit Compilation  
-https://github.com/mturk/cmsc/releases/tag/v15.0.28
-download cmsc-15.0_28-win7-x86_x64.zip and unzip in C:
+https://github.com/mturk/cmsc/releases/tag/v15.0.47
+download cmsc-15.0_47-win7-x86_x64.zip and unzip in C:
 
 
 BUILDING
@@ -28,12 +28,12 @@ Obtain the source code:
 
 Build  isapi_redirector.dll:
 
-c:\cmsc-15.0_28\setenv.bat x86
+c:\cmsc-15.0_47\setenv.bat x86
 nmake -f Makefile.vc
 
 open new cmd.exe
 
-c:\cmsc-15.0_28\setenv.bat x64
+c:\cmsc-15.0_47\setenv.bat x64
 nmake -f Makefile.vc
 
 Tomcat isapi_redirect DLLs may then be found in


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

[tomcat-connectors] 01/03: Updates paths

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit b9af887a077ddfa7243395cabdd8ab91e3955ef5
Author: Mark Thomas 
AuthorDate: Thu Sep 7 13:22:24 2023 +0100

Updates paths
---
 native/iis/README | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index 2826220be..385aea3bd 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -51,22 +51,22 @@ Construct the binary distributions
   copy ..\LICENSE tomcat-connectors-%VER%-windows-i386-iis\
   copy ..\NOTICE tomcat-connectors-%VER%-windows-i386-iis\
   copy README tomcat-connectors-%VER%-windows-i386-iis\
-  copy Release_x86\isapi_redirect.dll tomcat-connectors-%VER%-windows-i386-iis\
+  copy x86_RELEASE\isapi_redirect.dll tomcat-connectors-%VER%-windows-i386-iis\
   mkdir tomcat-connectors-%VER%-windows-x86_64-iis
   copy ..\LICENSE tomcat-connectors-%VER%-windows-x86_64-iis\
   copy ..\NOTICE tomcat-connectors-%VER%-windows-x86_64-iis\
   copy README tomcat-connectors-%VER%-windows-x86_64-iis\
-  copy Release_amd64\isapi_redirect.dll 
tomcat-connectors-%VER%-windows-x86_64-iis\
+  copy x64_RELEASE\isapi_redirect.dll 
tomcat-connectors-%VER%-windows-x86_64-iis\
   mkdir tomcat-connectors-%VER%-windows-i386-symbols
   copy ..\LICENSE tomcat-connectors-%VER%-windows-i386-symbols
   copy ..\NOTICE tomcat-connectors-%VER%-windows-i386-symbols
   copy README tomcat-connectors-%VER%-windows-i386-symbols\
-  copy Release_x86\isapi_redirect.pdb 
tomcat-connectors-%VER%-windows-i386-symbols\
+  copy x86_RELEASE\isapi_redirect.pdb 
tomcat-connectors-%VER%-windows-i386-symbols\
   mkdir tomcat-connectors-%VER%-windows-x86_64-symbols
   copy ..\LICENSE tomcat-connectors-%VER%-windows-x86_64-symbols
   copy ..\NOTICE tomcat-connectors-%VER%-windows-x86_64-symbols
   copy README tomcat-connectors-%VER%-windows-x86_64-symbols\
-  copy Release_amd64\isapi_redirect.pdb 
tomcat-connectors-%VER%-windows-x86_64-symbols\
+  copy x64_RELEASE\isapi_redirect.pdb 
tomcat-connectors-%VER%-windows-x86_64-symbols\
   SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_71   
   set PATH=%PATH%;%JAVA_HOME%\bin
   cd tomcat-connectors-%VER%-windows-i386-iis


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

[tomcat-connectors] 03/03: Update version for next development cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 963347be02958f1a792a177deea1729a4d704c97
Author: Mark Thomas 
AuthorDate: Thu Sep 7 13:26:02 2023 +0100

Update version for next development cycle
---
 HOWTO-RELEASE.txt   | 12 ++--
 native/configure.ac |  2 +-
 native/iis/README   |  2 +-
 tools/dist/README.html  |  6 +++---
 tools/dist/binaries/windows/README.html |  2 +-
 xdocs/build.xml |  2 +-
 xdocs/miscellaneous/changelog.xml   |  2 ++
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 186baf7bb..f8e58978c 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -66,11 +66,11 @@ Use the pattern below for tagging the tomcat-connectors 
directory.
 
 TAG=JK_{MAJOR_REVISION}_{MINOR_REVISION}_{RELEASE}
 
-Here is an example for mod_jk 1.2.49
+Here is an example for mod_jk 1.2.50
 
-git commit -a -m "Tag JK_1_2_48"
-git tag JK_1_2_48
-git push origin JK_1_2_48
+git commit -a -m "Tag JK_1_2_50"
+git tag JK_1_2_50
+git push origin JK_1_2_50
 # reset main
 
 
@@ -91,9 +91,9 @@ Create the new source distribution
 A tool named jkrelease.sh in the directory tools creates
 a release tarball and a zip including signature files.
 
-Here is an example for mod_jk 1.2.49
+Here is an example for mod_jk 1.2.50
 
-./jkrelease.sh -R git -v 1.2.49 -h
+./jkrelease.sh -R git -v 1.2.50 -h
 
 
 
diff --git a/native/configure.ac b/native/configure.ac
index 05e59c49d..77104431c 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -22,7 +22,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.49])
+AC_INIT([mod_jk], [1.2.50])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)
diff --git a/native/iis/README b/native/iis/README
index d01e18383..ef070ac0a 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -46,7 +46,7 @@ RELEASING
 
 Construct the binary distributions
 
-  set VER=1.2.49
+  set VER=1.2.50
   mkdir tomcat-connectors-%VER%-windows-i386-iis
   copy ..\LICENSE tomcat-connectors-%VER%-windows-i386-iis\
   copy ..\NOTICE tomcat-connectors-%VER%-windows-i386-iis\
diff --git a/tools/dist/README.html b/tools/dist/README.html
index 648023193..f38e5c7a9 100644
--- a/tools/dist/README.html
+++ b/tools/dist/README.html
@@ -47,13 +47,13 @@ nearest mirror site!
 
 
 % pgpk -a KEYS
-% pgpv tomcat-connectors-1.2.49-src.tar.gz.asc
+% pgpv tomcat-connectors-1.2.50-src.tar.gz.asc
 or,
 % pgp -ka KEYS
-% pgp tomcat-connectors-1.2.49-src.tar.gz.asc
+% pgp tomcat-connectors-1.2.50-src.tar.gz.asc
 or,
 % gpg --import KEYS
-% gpg --verify tomcat-connectors-1.2.49-src.tar.gz.asc
+% gpg --verify tomcat-connectors-1.2.50-src.tar.gz.asc
 
 
 We provide SHA512 hashes as an alternative to validate the integrity
diff --git a/tools/dist/binaries/windows/README.html 
b/tools/dist/binaries/windows/README.html
index e961ed878..a2e231c35 100644
--- a/tools/dist/binaries/windows/README.html
+++ b/tools/dist/binaries/windows/README.html
@@ -27,7 +27,7 @@
connector to fail.
 
 
-The current stable release is 1.2.49
+The current stable release is 1.2.50
 
 See the Apache Tomcat Connectors
 http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";>changelog
diff --git a/xdocs/build.xml b/xdocs/build.xml
index 0043769a9..6124771e3 100644
--- a/xdocs/build.xml
+++ b/xdocs/build.xml
@@ -32,7 +32,7 @@
   
   
 
-  
+  
 
   
 
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 6318a837f..1bcaa5f51 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -50,6 +50,8 @@
   new documentation project for JK was started.
   
 
+
+
 
   
 


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

[tomcat] branch main updated: Locking cleanup

[remm]

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 7af1a7586a Locking cleanup
7af1a7586a is described below

commit 7af1a7586a6edbd459dfdf40a620b953ad8a3449
Author: remm 
AuthorDate: Thu Sep 7 15:20:18 2023 +0200

Locking cleanup

Identified by coverity.
---
 java/org/apache/catalina/realm/MemoryRealm.java | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index e918a89eb7..2de6ab75dc 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -187,6 +187,7 @@ public class MemoryRealm extends RealmBase {
  * necessary.
  */
 protected Digester getDigester() {
+// Keep locking for subclass compatibility
 synchronized (digesterLock) {
 if (digester == null) {
 digester = new Digester();
@@ -226,16 +227,16 @@ public class MemoryRealm extends RealmBase {
 log.debug(sm.getString("memoryRealm.loadPath", pathName));
 }
 
-Digester digester = getDigester();
-try {
-synchronized (digester) {
+synchronized (digesterLock) {
+Digester digester = getDigester();
+try {
 digester.push(this);
 digester.parse(is);
+} catch (Exception e) {
+throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
+} finally {
+digester.reset();
 }
-} catch (Exception e) {
-throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
-} finally {
-digester.reset();
 }
 } catch (IOException ioe) {
 throw new LifecycleException(sm.getString("memoryRealm.loadExist", 
pathName), ioe);


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

[tomcat] branch 10.1.x updated: Locking cleanup

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 7fd80083ec Locking cleanup
7fd80083ec is described below

commit 7fd80083ec1aa45154c142820c05404490a206de
Author: remm 
AuthorDate: Thu Sep 7 15:20:18 2023 +0200

Locking cleanup

Identified by coverity.
---
 java/org/apache/catalina/realm/MemoryRealm.java | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index e918a89eb7..2de6ab75dc 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -187,6 +187,7 @@ public class MemoryRealm extends RealmBase {
  * necessary.
  */
 protected Digester getDigester() {
+// Keep locking for subclass compatibility
 synchronized (digesterLock) {
 if (digester == null) {
 digester = new Digester();
@@ -226,16 +227,16 @@ public class MemoryRealm extends RealmBase {
 log.debug(sm.getString("memoryRealm.loadPath", pathName));
 }
 
-Digester digester = getDigester();
-try {
-synchronized (digester) {
+synchronized (digesterLock) {
+Digester digester = getDigester();
+try {
 digester.push(this);
 digester.parse(is);
+} catch (Exception e) {
+throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
+} finally {
+digester.reset();
 }
-} catch (Exception e) {
-throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
-} finally {
-digester.reset();
 }
 } catch (IOException ioe) {
 throw new LifecycleException(sm.getString("memoryRealm.loadExist", 
pathName), ioe);


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

[tomcat] branch 9.0.x updated: Locking cleanup

[remm]

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 5f76adcf66 Locking cleanup
5f76adcf66 is described below

commit 5f76adcf6661caece403a05cddc4c638c1425666
Author: remm 
AuthorDate: Thu Sep 7 15:20:18 2023 +0200

Locking cleanup

Identified by coverity.
---
 java/org/apache/catalina/realm/MemoryRealm.java | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index 9f12cd4055..70a437df42 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -176,6 +176,7 @@ public class MemoryRealm extends RealmBase {
  * necessary.
  */
 protected Digester getDigester() {
+// Keep locking for subclass compatibility
 synchronized (digesterLock) {
 if (digester == null) {
 digester = new Digester();
@@ -222,16 +223,16 @@ public class MemoryRealm extends RealmBase {
 log.debug(sm.getString("memoryRealm.loadPath", pathName));
 }
 
-Digester digester = getDigester();
-try {
-synchronized (digester) {
+synchronized (digesterLock) {
+Digester digester = getDigester();
+try {
 digester.push(this);
 digester.parse(is);
+} catch (Exception e) {
+throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
+} finally {
+digester.reset();
 }
-} catch (Exception e) {
-throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
-} finally {
-digester.reset();
 }
 } catch (IOException ioe) {
 throw new LifecycleException(sm.getString("memoryRealm.loadExist", 
pathName), ioe);


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

[tomcat] branch 8.5.x updated: Locking cleanup

[remm]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e40bd00bb6 Locking cleanup
e40bd00bb6 is described below

commit e40bd00bb69a967120417ddaea7aa6f81f382bcd
Author: remm 
AuthorDate: Thu Sep 7 15:20:18 2023 +0200

Locking cleanup

Identified by coverity.
---
 java/org/apache/catalina/realm/MemoryRealm.java | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index 30d3e5f037..59d1a60893 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -184,6 +184,7 @@ public class MemoryRealm extends RealmBase {
  * necessary.
  */
 protected Digester getDigester() {
+// Keep locking for subclass compatibility
 synchronized (digesterLock) {
 if (digester == null) {
 digester = new Digester();
@@ -237,16 +238,16 @@ public class MemoryRealm extends RealmBase {
 log.debug(sm.getString("memoryRealm.loadPath", pathName));
 }
 
-Digester digester = getDigester();
-try {
-synchronized (digester) {
+synchronized (digesterLock) {
+Digester digester = getDigester();
+try {
 digester.push(this);
 digester.parse(is);
+} catch (Exception e) {
+throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
+} finally {
+digester.reset();
 }
-} catch (Exception e) {
-throw new 
LifecycleException(sm.getString("memoryRealm.readXml"), e);
-} finally {
-digester.reset();
 }
 } catch (IOException ioe) {
 throw new LifecycleException(sm.getString("memoryRealm.loadExist", 
pathName), ioe);


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

[GitHub] [tomcat] anuragdy opened a new pull request, #666: Performance improvements for ImplicitObjectELResolver

[via GitHub]

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

   Fixes [67080](https://bz.apache.org/bugzilla/show_bug.cgi?id=67080). 
   
   
   Tested the speed using following Test Code -
   
   ```
   package com.amazon.weblab;
   
   import java.util.Arrays;
   import java.util.HashMap;
   
   public class TestImplicitObjectELResolver {
   private static final String[] SCOPE_NAMES = new 
String[]{"applicationScope", "cookie", "header", "headerValues",
   "initParam", "pageContext", "pageScope", "param", "paramValues", 
"requestScope", "sessionScope"};
   
   private enum Scope {
   applicationScope(0), cookie(1), header(2), headerValues(3), 
initParam(4), pageContext(5), pageScope(6), param(7), paramValues(8),
   requestScope(9), sessionScope(10);
   
   final public int idx;
   
   private static final HashMap lookupMap = new 
HashMap<>();
   
   static {
   lookupMap.put("applicationScope", applicationScope);
   lookupMap.put("cookie", cookie);
   lookupMap.put("header", header);
   lookupMap.put("headerValues", headerValues);
   lookupMap.put("initParam", initParam);
   lookupMap.put("pageContext", pageContext);
   lookupMap.put("pageScope", pageScope);
   lookupMap.put("param", param);
   lookupMap.put("paramValues", paramValues);
   lookupMap.put("requestScope", requestScope);
   lookupMap.put("sessionScope", sessionScope);
   }
   
   Scope(int idx) {
   this.idx = idx;
   }
   
   public static Scope fromValue(String value){
   return lookupMap.get(value);
   }
   
   }
   
   private static final String[] TEST_SCOPES = {"requestScope", 
"pageScope", "sessionScope", "pageContext", "header",
   "applicationScope", "cookie", "headerValues", "initParam", 
"param", "paramValues"};
   
   public static void main(String[] args) {
   new TestImplicitObjectELResolver().runTests();
   }
   
   private final int numTestIterations;
   
   private final int numTests;
   
   public TestImplicitObjectELResolver() {
   numTests = 10;
   numTestIterations = 1000;
   }
   
   protected void runNewTest() {
   int foundScope = -1;
   for (int i = 0; i < TEST_SCOPES.length; i++) {
   String scope = TEST_SCOPES[i];
   switch (scope) {
   case "requestScope":
   foundScope = 1;
   break;
   case "pageScope":
   foundScope = 2;
   break;
   case "sessionScope":
   foundScope = 3;
   break;
   case "pageContext":
   foundScope = 4;
   break;
   case "header":
   foundScope = 5;
   break;
   case "applicationScope":
   foundScope = 6;
   break;
   case "cookie":
   foundScope = 7;
   break;
   case "headerValues":
   foundScope = 8;
   break;
   case "initParam":
   foundScope = 9;
   break;
   case "param":
   foundScope = 10;
   break;
   case "paramValues":
   foundScope = 11;
   break;
   default:
   throw new RuntimeException("Did not find scope for value 
" + scope);
   }
   if (foundScope < 0) {
   throw new RuntimeException();
   }
   }
   }
   
   protected void runOldTest() {
   for (int i = 0; i < TEST_SCOPES.length; i++) {
   Arrays.binarySearch(SCOPE_NAMES, TEST_SCOPES[i]);
   }
   }
   
   protected void runSecondNewTest() {
   for (int i = 0; i < TEST_SCOPES.length; i++) {
   Scope.fromValue(TEST_SCOPES[i]);
   }
   }
   
   protected void runTests() {
   // warmup
   for (int i = 0; i < numTestIterations; i++) {
   runOldTest();
   runNewTest();
   runSecondNewTest();
   }
   
   for (int i = 0; i < numTests; i++) {
   System.gc();
   long startOld = System.currentTimeMillis();
   for (int j = 0; j < numTestIterations; j++) {
   runOldTest();
   }
   System.out.println("Done with old in " + 
(System.currentTimeMillis() - startOld));
   }
   
   for (int i = 0; i < numTests; i

[Bug 67080] ImplicitObjectELResolverImpl.getValue() is slow

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=67080

--- Comment #5 from Anurag Dubey  ---
Create Pull Request for the proposed change, have also shared the performance
comparison for Old vs Switch implementation vs Hashmap implementation -
https://github.com/apache/tomcat/pull/666

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

[Bug 67080] ImplicitObjectELResolverImpl.getValue() is slow

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=67080

--- Comment #6 from John Engebretson  ---
Anurag's solution is clearly faster than mine, I like it.

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

[GitHub] [tomcat] michael-o commented on a diff in pull request #666: Performance improvements for ImplicitObjectELResolver

[via GitHub]

michael-o commented on code in PR #666:
URL: https://github.com/apache/tomcat/pull/666#discussion_r1318844150


##
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java:
##
@@ -44,31 +44,32 @@
  * @since JSP 2.1
  */
 public class ImplicitObjectELResolver extends ELResolver {
+private enum Scope {
+APPLICATION_SCOPE, COOKIE, HEADER, HEADER_VALUES, INIT_PARAM, 
PAGE_CONTEXT, PAGE_SCOPE, PARAM, PARAM_VALUES,
+REQUEST_SCOPE, SESSION_SCOPE;

Review Comment:
   Aren't the `_SCOPE` suffixes redundant?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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

[Bug 67293] New: WsRemoteEndpointImplBase throws IllegalStateException: WebSocket session has been closed

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=67293

Bug ID: 67293
   Summary: WsRemoteEndpointImplBase throws IllegalStateException:
WebSocket session has been closed
   Product: Tomcat 10
   Version: 10.1.11
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: outsider...@gmail.com
  Target Milestone: --

My client, java.net.http.WebSocket.Listener, is 
public onText(WebSocket webSocket,...) { webSocket.abort()

My server (Spring Boot) is

WebSocketSession session;
try {
  session.sendText(...)
} catch (IllegalStateException e) {
  logger.error("session.isOpen == {}", session.isOpen(), e);

And output is:
session.isOpen ==  true
java.lang.IllegalStateException: Message will not be sent because the WebSocket
session has been closed
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.writeMessagePart(WsRemoteEndpointImplBase.java:450)

Where is a bug?

First, it is strange that however session is still open, I got exception that
session is closed. But I can accept than synchronization may be delayed

Second, I browsed a Javadoc and I found

https://docs.oracle.com/en/java/javase/17/docs/api/java.net.http/java/net/http/WebSocket.html#sendText(java.lang.CharSequence,boolean)

"(...)A CompletableFuture returned from this method can complete exceptionally
with:

IllegalStateException - if there is a pending text or binary send operation or
if the previous binary data does not complete the message
IOException - if an I/O error occurs, or if the output is closed (...)"

Then second problem, a real bug, is that when session is closed, IOexception
should be thrown, not IllegalStateException

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

[GitHub] [tomcat] anuragdy commented on a diff in pull request #666: Performance improvements for ImplicitObjectELResolver

[via GitHub]

anuragdy commented on code in PR #666:
URL: https://github.com/apache/tomcat/pull/666#discussion_r1319322612


##
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java:
##
@@ -44,31 +44,32 @@
  * @since JSP 2.1
  */
 public class ImplicitObjectELResolver extends ELResolver {
+private enum Scope {
+APPLICATION_SCOPE, COOKIE, HEADER, HEADER_VALUES, INIT_PARAM, 
PAGE_CONTEXT, PAGE_SCOPE, PARAM, PARAM_VALUES,
+REQUEST_SCOPE, SESSION_SCOPE;

Review Comment:
   They are consistent with the property values, but certainly redundant.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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