Re: [PR] Correctly Proxy Statement returned from ResultSet [tomcat]

2024-08-08 Thread via GitHub


mc1arke commented on PR #742:
URL: https://github.com/apache/tomcat/pull/742#issuecomment-2275124454

   @chrisw-s Do you have a stacktrace that shows the exception you're getting 
or steps to reproduce the issue?


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

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

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


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



(tomcat-connectors) branch main updated: Improve shared memory handling on non-Windows.

2024-08-08 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new d55706e92 Improve shared memory handling on non-Windows.
d55706e92 is described below

commit d55706e92b65018c2e4c7ab14014a996b0174966
Author: Rainer Jung 
AuthorDate: Thu Aug 8 10:00:13 2024 +0200

Improve shared memory handling on non-Windows.
---
 native/common/jk_shm.c| 12 ++--
 xdocs/miscellaneous/changelog.xml |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/native/common/jk_shm.c b/native/common/jk_shm.c
index 857a17ac4..870f8418c 100644
--- a/native/common/jk_shm.c
+++ b/native/common/jk_shm.c
@@ -451,7 +451,7 @@ static int do_shm_open_lock(const char *fname, int 
attached, jk_log_context_t *l
 
 if (attached && jk_shmem.lockname) {
 #ifdef JK_SHM_LOCK_REOPEN
-jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0666);
+jk_shmem.fd_lock = open(jk_shmem.lockname, O_RDWR, 0600);
 #else
 errno = EINVAL;
 #endif
@@ -475,7 +475,7 @@ static int do_shm_open_lock(const char *fname, int 
attached, jk_log_context_t *l
 for (i = 0; i < 8; i++) {
 strcpy(flkname, "/tmp/jkshmlock.XX");
 if (mktemp(flkname)) {
-jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
+jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0600);
 if (jk_shmem.fd_lock >= 0)
 break;
 }
@@ -487,10 +487,10 @@ static int do_shm_open_lock(const char *fname, int 
attached, jk_log_context_t *l
 #ifdef AS400_UTF8
 wptr = (char *)malloc(strlen(flkname) + 1);
 jk_ascii2ebcdic((char *)flkname, wptr);
-jk_shmem.fd_lock = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0666);
+jk_shmem.fd_lock = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0600);
 free(wptr);
 #else
-jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0666);
+jk_shmem.fd_lock = open(flkname, O_RDWR|O_CREAT|O_TRUNC, 0600);
 #endif
 #endif
 if (jk_shmem.fd_lock == -1) {
@@ -581,10 +581,10 @@ static int do_shm_open(const char *fname, int attached,
 #ifdef AS400_UTF8
 wptr = (char *)malloc(strlen(jk_shmem.filename) + 1);
 jk_ascii2ebcdic((char *)jk_shmem.filename, wptr);
-fd = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0666);
+fd = open(wptr, O_RDWR|O_CREAT|O_TRUNC, 0600);
 free(wptr);
 #else
-fd = open(jk_shmem.filename, O_RDWR|O_CREAT|O_TRUNC, 0666);
+fd = open(jk_shmem.filename, O_RDWR|O_CREAT|O_TRUNC, 0600);
 #endif
 if (fd == -1) {
 jk_shmem.size = 0;
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 8e64986aa..026ea6023 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -58,6 +58,9 @@
 to reduce symbol visibility. Also improve escaping of it in the 
Makefile.
 Patch provided by lzs...@freemail.c3.hu. (rjung)
   
+  
+Improve shared memory handling on non-Windows. (rjung)
+  
 
   
   


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



[Bug 69245] Tomcat.addWebapp() doesn't expire sessions after Tomcat.start()

2024-08-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69245

Jörg von Frantzius  changed:

   What|Removed |Added

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

--- Comment #8 from Jörg von Frantzius  ---
Thanks for pointing me to the test.

In the meantime, I found out that this was a timing problem that has to do with
sessions being reaped only every 10s, while my thinking was that it would be
more precise (e.g. with timers per session). 

My test did wait for 1m + 5s, and it seems that with the SESSIONS.ser file
being present, the timing is consistently changed in a way that allowed this to
work.

When I wait for session expiry like this, it works always:

   LOG.warn("Waiting 1 minute for session timeout");
try {
TimeUnit.SECONDS.sleep(60 +
tomcat.getEngine().getBackgroundProcessorDelay() * 2 + 2);

Probably the spec does not say anything about it, but a positive time-jitter of
10s-20s for session expiry was confusing at least for me.

Sorry for stealing your time!

-- 
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 69245] Tomcat.addWebapp() doesn't expire sessions after Tomcat.start()

2024-08-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69245

--- Comment #9 from Jörg von Frantzius  ---
"works always" - well, at least on my machine, but not in Jenkins :-/

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



(tomcat-connectors) branch main updated: Add news page for 2024 with an estimate of the 1.2.50 release date

2024-08-08 Thread 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


The following commit(s) were added to refs/heads/main by this push:
 new 9612683ac Add news page for 2024 with an estimate of the 1.2.50 
release date
9612683ac is described below

commit 9612683ac09ebb06aca9ad25cdd7274152c6d031
Author: Mark Thomas 
AuthorDate: Thu Aug 8 10:33:50 2024 +0100

Add news page for 2024 with an estimate of the 1.2.50 release date
---
 xdocs/news/20240101.xml | 48 
 1 file changed, 48 insertions(+)

diff --git a/xdocs/news/20240101.xml b/xdocs/news/20240101.xml
new file mode 100644
index 0..9e30df272
--- /dev/null
+++ b/xdocs/news/20240101.xml
@@ -0,0 +1,48 @@
+
+
+
+]>
+
+
+  &project;
+
+  
+Apache Tomcat Connectors 
Project
+2024 News & Status
+  
+
+
+
+
+
+
+The Apache Tomcat team is proud to announce the immediate availability
+   of Tomcat Connectors 1.2.50. This is a maintenance release.
+
+Please see the ChangeLog
+   for a full list of changes.
+
+If you find any bugs while using this release, please fill in the
+https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla
+Bug Report.
+
+
+
+
+


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



(tomcat-connectors) tag JK_1_2_50 created (now 9612683ac)

2024-08-08 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


  at 9612683ac (commit)
No new revisions were added by this update.


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



[Bug 69245] Tomcat.addWebapp() doesn't expire sessions after Tomcat.start()

2024-08-08 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=69245

--- Comment #10 from Jörg von Frantzius  ---
Thx again Christopher, for the records, this is how Tomcat's own test does it:
https://github.com/apache/tomcat/blob/main/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java#L162

For others reading this at some point, the test's wait delay time is reduced to
< 1 minute by dynamically setting the session's maxInactiveInterval in seconds
(web.xml allows for minutes only), so speeding up test execution.

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



Re: [PR] Correctly Proxy Statement returned from ResultSet [tomcat]

2024-08-08 Thread via GitHub


chrisw-s commented on PR #742:
URL: https://github.com/apache/tomcat/pull/742#issuecomment-2275611258

   Just this:
   ```
   try (Statement statement = connection.createStatement();
ResultSet resultSet = 
statement.executeQuery("sp_help_fulltext_catalogs")) {
 fullTextSearchable = resultSet.next();
   }
   -->   catch (SQLException ex) {
   ```
   This is with using JTDS. It works fine in 10.1.26


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



Re: [PR] Correctly Proxy Statement returned from ResultSet [tomcat]

2024-08-08 Thread via GitHub


VRBogdanov commented on PR #742:
URL: https://github.com/apache/tomcat/pull/742#issuecomment-2275626750

   Hello,
   
   Same is observed on my side with the following strack trace below. With 
latest tomcat 9.091 is ok while after updating to tomcat 9.092/93 it fails. The 
problem is that DB initiation is delegated to liquibase and after that fails 
application initialisation.
   ```
   
   java.lang.reflect.UndeclaredThrowableException
  liquibase.exception.LockException: 
java.lang.reflect.UndeclaredThrowableException
at 
liquibase.lockservice.StandardLockService.listLocks(StandardLockService.java:280)
at *
at 
liquibase.Liquibase.update(Liquibase.java:194)
at 
liquibase.Liquibase.update(Liquibase.java:190)
at 
liquibase.integration.spring.SpringLiquibase.performUpdate(SpringLiquibase.java:434)
at 
liquibase.integration.spring.SpringLiquibase.afterPropertiesSet(SpringLiquibase.java:391)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1863)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1800)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:620)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:336)
at 
org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:334)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:209)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:323)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:209)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:323)
at 
org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:209)
at 
org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
at 
org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1391)
at 
org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
at 
org.springframework.beans.factory.support.ConstructorResolver.resolveAutowiredArgument(ConstructorResolver.java:904)
at 
org.springframework.beans.factory.support.ConstructorResolver.createArgumentArray(ConstructorResolver.java:781)
at 
org.springframework.beans.factory.support.ConstructorResolver.autowireConstructor(ConstructorResolver.java:220)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireConstructor(AbstractAutowireCapableBeanFactory.java:1372)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1222)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:582)
at 
org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowir

Re: [PR] Correctly Proxy Statement returned from ResultSet [tomcat]

2024-08-08 Thread via GitHub


mc1arke commented on PR #742:
URL: https://github.com/apache/tomcat/pull/742#issuecomment-2275689404

   Ah, ok. It's an exception being thrown whilst executing the underlying 
statement, which is happening outside the existing try/catch block that unwraps 
the exception. I'll raise a Bugzilla record and propose a PR to fix it.


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



svn commit: r70747 - in /dev/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/

2024-08-08 Thread markt
Author: markt
Date: Thu Aug  8 14:01:55 2024
New Revision: 70747

Log:
Upload Tomcat Connectors 1.2.50 for voting

Added:

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.sha512
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz   (with 
props)
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.asc
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.sha512
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip   (with 
props)
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.asc
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.sha512
Modified:
dev/tomcat/tomcat-connectors/jk/README.html
dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html

Modified: dev/tomcat/tomcat-connectors/jk/README.html
==
--- dev/tomcat/tomcat-connectors/jk/README.html (original)
+++ dev/tomcat/tomcat-connectors/jk/README.html Thu Aug  8 14:01:55 2024
@@ -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

Modified: dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html
==
--- dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html (original)
+++ dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html Thu Aug  8 
14:01:55 2024
@@ -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

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc
 Thu Aug  8 14:01:55 2024
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAma0z3QACgkQEMAcWi9g
+WedkABAAgNtSIWXvflroTbWpYhQDDP3I2l7aYdJfOjbjw7YULRNwOo0+vGgIaRF8
+0pyNf7hWmkianhb7/YAlnSUSmaiZUDQAtIY9tuRH1CxZEhhnl199vL+DIlb6QgFI
+btIOdXb7hjrxv/1acPoJdxAD0HIWtBHsIf4sHe8iLDvBrS9pucaLp8jRoqDah4Cb
+qJb0iCxy9xLlIEhIvVbpmvPkBGRq+Bz9EnhWK5J3kZL/1lZo6oaonCSJ/0tQ/4eJ
+ZwKNB/rAZW+y+JJU7PYrlXgVkAAXiHS6hea

[VOTE] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-08 Thread Mark Thomas

Tag:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Source:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Dist:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of dependency updates and 
bug fixes (compared to 1.2.49). It also includes Windows binaries for IIS.


The significant changes are:
- Improve shared memory handling on non-Windows

The proposed JK 1.2.50 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 1.2.50

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



Re: [VOTE] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-08 Thread Mark Thomas

On 08/08/2024 15:13, Mark Thomas wrote:

The proposed JK 1.2.50 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 1.2.50


Compiles on Ubuntu 22.04 (fully patched) and passes a simple smoke test 
with httpd.


Windows binary for 64-bit passes a simple smoke test on:
- Windows 2022
- Windows 2012
- Windows 11

Mark

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



(tomcat) branch main updated: More improvements to exception handling during WebSocket msg processing

2024-08-08 Thread 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.git


The following commit(s) were added to refs/heads/main by this push:
 new 00ef1b65d7 More improvements to exception handling during WebSocket 
msg processing
00ef1b65d7 is described below

commit 00ef1b65d71c3cd6f826461a54aacaa332c59196
Author: Mark Thomas 
AuthorDate: Thu Aug 8 17:31:21 2024 +0100

More improvements to exception handling during WebSocket msg processing

This broadens the previous fix that just addressed issues with Encoders
and reworks some unit tests that expected an exception during message
processing to close the connection.
---
 .../tomcat/websocket/pojo/LocalStrings.properties  |  2 +-
 .../websocket/pojo/PojoMessageHandlerBase.java | 26 ++--
 .../pojo/PojoMessageHandlerPartialBase.java|  6 ++-
 .../pojo/PojoMessageHandlerWholeBase.java  |  6 ++-
 .../tomcat/websocket/TestWsRemoteEndpoint.java | 28 +++--
 .../apache/tomcat/websocket/TesterEchoServer.java  | 46 +++---
 webapps/docs/changelog.xml |  8 ++--
 7 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties 
b/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
index c9ef340cba..a59548013b 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
@@ -19,7 +19,7 @@ pojoEndpointBase.onError=No error handling configured for 
[{0}] and the followin
 pojoEndpointBase.onErrorFail=Failed to call onError method of POJO end point 
for POJO of type [{0}]
 pojoEndpointBase.onOpenFail=Failed to call onOpen method of POJO end point for 
POJO of type [{0}]
 
-pojoMessageHandlerBase.encodeFail=Encoding failed for POJO of tyoe [{0}] in 
session [{1}]
+pojoMessageHandlerBase.onMessafeFail=Exception during onMessage call to POJO 
of type [{0}] in session [{1}]
 
 pojoMessageHandlerWhole.decodeIoFail=IO error while decoding message
 pojoMessageHandlerWhole.maxBufferSize=The maximum supported message size for 
this implementation is Integer.MAX_VALUE
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java 
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
index b52fbbba20..4d96720306 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
@@ -17,6 +17,7 @@
 package org.apache.tomcat.websocket.pojo;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
@@ -114,19 +115,20 @@ public abstract class PojoMessageHandlerBase 
implements WrappedMessageHandler
 }
 
 
-protected final void handlePojoMethodException(Throwable t) {
-t = ExceptionUtils.unwrapInvocationTargetException(t);
+protected final void 
handlePojoMethodInvocationTargetException(InvocationTargetException e) {
+/*
+ * This is a failure during the execution of onMessage. This does not 
normally need to trigger the failure of
+ * the WebSocket connection.
+ */
+Throwable t = ExceptionUtils.unwrapInvocationTargetException(e);
+// Check for JVM wide issues
 ExceptionUtils.handleThrowable(t);
-if (t instanceof EncodeException) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("pojoMessageHandlerBase.encodeFail", 
pojo.getClass().getName(), session.getId()),
-t);
-}
-((WsSession) session).getLocal().onError(session, t);
-} else if (t instanceof RuntimeException) {
-throw (RuntimeException) t;
-} else {
-throw new RuntimeException(t.getMessage(), t);
+// Log at debug level since this is an application issue and the 
application should be handling this.
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("pojoMessageHandlerBase.onMessafeFail", 
pojo.getClass().getName(), session.getId()),
+t);
 }
+// Notify the application of the issue so it can handle it.
+((WsSession) session).getLocal().onError(session, t);
 }
 }
diff --git 
a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java 
b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
index 1614fa9fe5..aae708f0a1 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
@@ -65,8 +65,10 @@ public abstract class PojoMessageHandlerPartialBase 
extends PojoMessageHandle
 Object result = null;
 try {
 result = method.invoke(pojo, parameters);
- 

Re: [VOTE] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-08 Thread Christopher Schultz

Mark,

Thanks for RMing.

On 8/8/24 10:13, Mark Thomas wrote:

Tag:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Source:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Dist:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of dependency updates and 
bug fixes (compared to 1.2.49). It also includes Windows binaries for IIS.


The significant changes are:
- Improve shared memory handling on non-Windows

The proposed JK 1.2.50 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 1.2.50


+1 for stable release

Builds cleanly on Linux x86-64 with gcc 12.2.0 and GNU make 4.3.

Works with an HTTP-only application in a development environment.

Note that there is an instruction to run "libtool --finish 
/usr/lib/apache2/modules" which succeeds on my system with no errors and 
the bold statement:


Libraries have been installed in:
   /usr/lib/apache2/modules

The .so file has not, in face, been installed. I don't know if this is a 
failing of GNU libtool (2.4.7) or our own packaging, messaging, etc.


-chris

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



[PR] Unwrap InvocationTargetException from underlying statement execution [tomcat]

2024-08-08 Thread via GitHub


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

   When executing a wrapped statement, any resulting SQLException is wrapped in 
an InvocationTargetException by the reflective invocation, which is rethrown by 
the InvocationHandler as an
   UndeclaredThrowableException. To ensure the expected SQLException is thrown, 
the invocation of the wrapped object is being moved into the existing try-catch 
block, thereby ensuring the InvocationTargetException is unwrapped and the 
underlying exception thrown by the handler.
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id=69255


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



Re: [PR] Correctly Proxy Statement returned from ResultSet [tomcat]

2024-08-08 Thread via GitHub


mc1arke commented on PR #742:
URL: https://github.com/apache/tomcat/pull/742#issuecomment-2276512539

   Proposed fix in #744 


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



Re: [VOTE] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-08 Thread Rainer Jung

Am 08.08.24 um 16:13 schrieb Mark Thomas:

Tag:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Source:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Dist:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of dependency updates and 
bug fixes (compared to 1.2.49). It also includes Windows binaries for IIS.


The significant changes are:
- Improve shared memory handling on non-Windows

The proposed JK 1.2.50 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 1.2.50


I still need to do some more checks but currently looks good except for 
the binary zip files: for 1.2.49 they contained LICENSE and NOTICE, for 
1.2.50 these are missing from the binaries zip files. Maybe there is an 
easy way to add them and redo the sha512 and gpg signature.


Thanks so far!

Rainer

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