[GitHub] [tomcat] greeng00se opened a new pull request, #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


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

   hello 😄 
   
   I was looking at the code for the Request class in coyote.
   Removed unnecessary brackets for consistency with the other code.
   
   e.g. `contentLength = (clB == null || clB.isNull()) ? -1 : clB.getLong();`


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



[GitHub] [tomcat] wonyongChoi05 opened a new pull request, #651: Refactor SSL certificate population method

2023-09-05 Thread via GitHub


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

   Simplified the SSL certificate population logic by removing the unnecessary 
null check and using an ArrayList for dynamic array management. The code is now 
more concise and readable, and it efficiently processes X.509 certificates.


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



Buildbot failure in on tomcat-11.0.x

2023-09-05 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/557
Blamelist: xxeol2 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] d0b655d8316bcef78b84255a9d8ee2f7cd78d649


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



[GitHub] [tomcat] aooohan closed pull request #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


aooohan closed pull request #650: Removed unnecessary brackets
URL: https://github.com/apache/tomcat/pull/650


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



[GitHub] [tomcat] aooohan commented on pull request #649: Eliminating duplicate execution of checkFacade logic

2023-09-05 Thread via GitHub


aooohan commented on PR #649:
URL: https://github.com/apache/tomcat/pull/649#issuecomment-1706095437

   This change doesn't make any sense.
   


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



[GitHub] [tomcat] aooohan closed pull request #649: Eliminating duplicate execution of checkFacade logic

2023-09-05 Thread via GitHub


aooohan closed pull request #649: Eliminating duplicate execution of 
checkFacade logic
URL: https://github.com/apache/tomcat/pull/649


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



[GitHub] [tomcat] aooohan commented on pull request #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


aooohan commented on PR #650:
URL: https://github.com/apache/tomcat/pull/650#issuecomment-1706094596

   This change doesn't make any sense.


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



[GitHub] [tomcat] aooohan commented on pull request #651: Refactor SSL certificate population method

2023-09-05 Thread via GitHub


aooohan commented on PR #651:
URL: https://github.com/apache/tomcat/pull/651#issuecomment-1706113147

   This change doesn't make any sense.


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



[GitHub] [tomcat] aooohan closed pull request #651: Refactor SSL certificate population method

2023-09-05 Thread via GitHub


aooohan closed pull request #651: Refactor SSL certificate population method
URL: https://github.com/apache/tomcat/pull/651


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



Buildbot success in on tomcat-10.1.x

2023-09-05 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/44/builds/919
Blamelist: lihan , xxeol2 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 10.1.x] a95d18861ccaa30a4264bcf97fb3e8a2e0f06de9


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



[Bug 63690] [HTTP/2] The socket [*] associated with this connection has been closed.

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63690

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

--- Comment #27 from Mark Thomas  ---
Don't re-open old issues because you think the stack trace looks similar.

Use the users list to obtain support.

-- 
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] markt-asf commented on pull request #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


markt-asf commented on PR #650:
URL: https://github.com/apache/tomcat/pull/650#issuecomment-1706269180

   The change is trivial but it makes sense to me.


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



[GitHub] [tomcat] markt-asf merged pull request #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


markt-asf merged PR #650:
URL: https://github.com/apache/tomcat/pull/650


-- 
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] branch main updated: Removed unnecessary brackets

2023-09-05 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 29a0ee94dc Removed unnecessary brackets
29a0ee94dc is described below

commit 29a0ee94dc6cc3b07c06070ef991120f90a768dc
Author: greeng00se 
AuthorDate: Tue Sep 5 16:15:04 2023 +0900

Removed unnecessary brackets
---
 java/org/apache/coyote/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index af87b4dadf..0155a6b575 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -474,7 +474,7 @@ public final class Request {
 
 public String getContentType() {
 contentType();
-if ((contentTypeMB == null) || contentTypeMB.isNull()) {
+if (contentTypeMB == null || contentTypeMB.isNull()) {
 return null;
 }
 return contentTypeMB.toString();


-
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: Removed unnecessary brackets

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

markt 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 e1f6784991 Removed unnecessary brackets
e1f6784991 is described below

commit e1f678499105dd4e2e9cd1e92f3ca1179fea238f
Author: greeng00se 
AuthorDate: Tue Sep 5 16:15:04 2023 +0900

Removed unnecessary brackets
---
 java/org/apache/coyote/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index e06530e217..2de47af2f5 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -453,7 +453,7 @@ public final class Request {
 
 public String getContentType() {
 contentType();
-if ((contentTypeMB == null) || contentTypeMB.isNull()) {
+if (contentTypeMB == null || contentTypeMB.isNull()) {
 return null;
 }
 return contentTypeMB.toString();


-
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: Removed unnecessary brackets

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 09f6abfa71 Removed unnecessary brackets
09f6abfa71 is described below

commit 09f6abfa7145f44ec7a71acae9815d0b1d773d7e
Author: greeng00se 
AuthorDate: Tue Sep 5 16:15:04 2023 +0900

Removed unnecessary brackets
---
 java/org/apache/coyote/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index 56d7b74b0a..74d4523838 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -437,7 +437,7 @@ public final class Request {
 
 public String getContentType() {
 contentType();
-if ((contentTypeMB == null) || contentTypeMB.isNull()) {
+if (contentTypeMB == null || contentTypeMB.isNull()) {
 return null;
 }
 return contentTypeMB.toString();


-
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: Removed unnecessary brackets

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 28cf6b3c9b Removed unnecessary brackets
28cf6b3c9b is described below

commit 28cf6b3c9bfdfc0767a683565ed9c23fad88f0ec
Author: greeng00se 
AuthorDate: Tue Sep 5 16:15:04 2023 +0900

Removed unnecessary brackets
---
 java/org/apache/coyote/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index 838dd34d57..354c4ac289 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -438,7 +438,7 @@ public final class Request {
 
 public String getContentType() {
 contentType();
-if ((contentTypeMB == null) || contentTypeMB.isNull()) {
+if (contentTypeMB == null || contentTypeMB.isNull()) {
 return null;
 }
 return contentTypeMB.toString();


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



[GitHub] [tomcat] markt-asf commented on pull request #649: Eliminating duplicate execution of checkFacade logic

2023-09-05 Thread via GitHub


markt-asf commented on PR #649:
URL: https://github.com/apache/tomcat/pull/649#issuecomment-1706282024

   The change makes sense to me. It removes a duplicate call to `checkFacade()`.


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



[GitHub] [tomcat] markt-asf merged pull request #649: Eliminating duplicate execution of checkFacade logic

2023-09-05 Thread via GitHub


markt-asf merged PR #649:
URL: https://github.com/apache/tomcat/pull/649


-- 
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] branch main updated: Eliminating duplicate execution of checkFacade logic

2023-09-05 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 3cbca9ce51 Eliminating duplicate execution of checkFacade logic
3cbca9ce51 is described below

commit 3cbca9ce51cd917aa18034ee212ec6351a2bee6c
Author: xxeol2 
AuthorDate: Tue Sep 5 13:53:43 2023 +0900

Eliminating duplicate execution of checkFacade logic
---
 java/org/apache/catalina/connector/RequestFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 7df0a8b00d..093edf659a 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -413,7 +413,6 @@ public class RequestFacade implements HttpServletRequest {
 
 @Override
 public HttpSession getSession() {
-checkFacade();
 return getSession(true);
 }
 


-
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: Eliminating duplicate execution of checkFacade logic

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

markt 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 d62e52a8a4 Eliminating duplicate execution of checkFacade logic
d62e52a8a4 is described below

commit d62e52a8a4603e0c3eee71eca0a960e8d68bf356
Author: xxeol2 
AuthorDate: Tue Sep 5 13:53:43 2023 +0900

Eliminating duplicate execution of checkFacade logic
---
 java/org/apache/catalina/connector/RequestFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index c815535472..27013fbdfa 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -642,7 +642,6 @@ public class RequestFacade implements HttpServletRequest {
 
 @Override
 public HttpSession getSession() {
-checkFacade();
 return getSession(true);
 }
 


-
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: Eliminating duplicate execution of checkFacade logic

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new be8ea48d54 Eliminating duplicate execution of checkFacade logic
be8ea48d54 is described below

commit be8ea48d544aa1de4f5a8836f9d89c4971d63771
Author: xxeol2 
AuthorDate: Tue Sep 5 13:53:43 2023 +0900

Eliminating duplicate execution of checkFacade logic
---
 java/org/apache/catalina/connector/RequestFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 44544a431f..3270f074a2 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -653,7 +653,6 @@ public class RequestFacade implements HttpServletRequest {
 
 @Override
 public HttpSession getSession() {
-checkFacade();
 return getSession(true);
 }
 


-
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: Eliminating duplicate execution of checkFacade logic

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 8500ae8fe1 Eliminating duplicate execution of checkFacade logic
8500ae8fe1 is described below

commit 8500ae8fe14402f03690965c747f1503b7f05edc
Author: xxeol2 
AuthorDate: Tue Sep 5 13:53:43 2023 +0900

Eliminating duplicate execution of checkFacade logic
---
 java/org/apache/catalina/connector/RequestFacade.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/RequestFacade.java 
b/java/org/apache/catalina/connector/RequestFacade.java
index 45946d76d2..059ea7238e 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -646,7 +646,6 @@ public class RequestFacade implements HttpServletRequest {
 
 @Override
 public HttpSession getSession() {
-checkFacade();
 return getSession(true);
 }
 


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



[Bug 66005] Apache crashes, if there is a tomcat server, which can not be resolved

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005

--- Comment #29 from Rainer Jung  ---
I don't have a solution ready in the direction that Michael mentions. Because
we don't call a linker directly and we don't want to. Linker flags are not
standardized. That's one reason for using libtool.

So I would apply the libtool "solution" in the next minutes and if we find a
better solution before the tag we can optimize. For me the original libtool
solution works in a release.

-- 
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 66005] Apache crashes, if there is a tomcat server, which can not be resolved

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005

--- Comment #30 from Mark Thomas  ---
Sounds good to me. Tx.

-- 
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: Apache: Only export the main module symbol.

2023-09-05 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 eda74b19e Apache: Only export the main module symbol.
eda74b19e is described below

commit eda74b19e4800e3ed8bb3351d8995d1b3eb44a4d
Author: Rainer Jung 
AuthorDate: Tue Sep 5 12:12:42 2023 +0200

Apache: 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)

Fixes BZ 66005.
---
 native/apache-2.0/Makefile.apxs.in | 5 +++--
 native/apache-2.0/Makefile.in  | 4 +++-
 xdocs/miscellaneous/changelog.xml  | 5 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/native/apache-2.0/Makefile.apxs.in 
b/native/apache-2.0/Makefile.apxs.in
index 907c82874..36aeada1c 100644
--- a/native/apache-2.0/Makefile.apxs.in
+++ b/native/apache-2.0/Makefile.apxs.in
@@ -19,8 +19,9 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 top_builddir=@top_builddir@
 APXS=@APXS@
-APXSLDFLAGS=@APXSLDFLAGS@
 APXSCFLAGS=@APXSCFLAGS@
+APXSLDFLAGS=@APXSLDFLAGS@
+JKLDFLAGS=-export-symbols-regex ^jk_module$
 
 COMMON=common
 JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
@@ -32,7 +33,7 @@ include @top_builddir@/common/list.mk
 all: mod_jk.la
 
 mod_jk.la:
-   $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} 
${srcdir}/mod_jk.c ${APACHE_OBJECTS}
+   $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} 
${JKLDFLAGS} ${srcdir}/mod_jk.c ${APACHE_OBJECTS}
 
 install: mod_jk.la
$(APXS) -i mod_jk.la
diff --git a/native/apache-2.0/Makefile.in b/native/apache-2.0/Makefile.in
index d5fab1bde..e63f5c921 100644
--- a/native/apache-2.0/Makefile.in
+++ b/native/apache-2.0/Makefile.in
@@ -23,6 +23,8 @@ MKDIR=@MKDIR@
 APXSCFLAGS=@APXSCFLAGS@
 APXSCPPFLAGS=@APXSCPPFLAGS@
 APXSLDFLAGS=@APXSLDFLAGS@
+JKLDFLAGS=-export-symbols-regexp ^jk_module$
+
 CC=@CC@
 SHELL=@SHELL@
 
@@ -80,7 +82,7 @@ mod_jk.lo: ${srcdir}/mod_jk.c
${LT_COMPILE}
 
 mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
-   $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath 
${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
+   $(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) ${JKLDFLAGS} -o $@ 
-module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
 
 mod_jk.so: mod_jk.la
${top_srcdir}/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' 
mod_jk.la `pwd`
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 4d103383d..86a637ed8 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -84,6 +84,11 @@
   body to httpd when the status code represents an error if the request 
used
   the HEAD method. (markt)
 
+
+  Apache: 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)
+
   
 
 


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



[GitHub] [tomcat] markt-asf commented on pull request #651: Refactor SSL certificate population method

2023-09-05 Thread via GitHub


markt-asf commented on PR #651:
URL: https://github.com/apache/tomcat/pull/651#issuecomment-1706340615

   The switch to using a wildcard import would need to be reverted as would the 
changes to blank lines between methods.
   The null check is necessary in some form and it is more concise than the 
alternative proposed in this PR.
   The switch to using an array list has merit. I'll implement that change 
shortly.


-- 
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 66005] Apache crashes, if there is a tomcat server, which can not be resolved

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005

--- Comment #31 from Rainer Jung  ---
I checked the libtool code. It provides the option -export-symbols-regexp,
which was suggested and which I know committed, and it also provides
-export-symbols with a file name containing the symbols. The implementation in
libtool is very similar. It first generates a full symbol list, then filters
the list (using egrep -e, or egrep) then then calls the linker with the result.
So the portability of both ways is pretty much the same and expected to be good
when using libtool. In our case having a separate symbol file doesn't seem to
be necessary, because the contract between the module and the httpd web server
is just this one stable symbol name.

Committed in GH eda74b19e4800e3ed8bb3351d8995d1b3eb44a4d.

Will be part of 1.2.49.

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



[tomcat] branch main updated: Simplify code. Based on PR #651 by wonyongChoi05

2023-09-05 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 f650ea788d Simplify code. Based on PR #651 by wonyongChoi05
f650ea788d is described below

commit f650ea788df8067baa4267ac4df806ba1bff1853
Author: Mark Thomas 
AuthorDate: Tue Sep 5 11:22:49 2023 +0100

Simplify code. Based on PR #651 by wonyongChoi05
---
 java/org/apache/coyote/ajp/AjpProcessor.java | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index ccf2e78ba1..9b6063ef33 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -26,9 +26,11 @@ import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -1131,10 +1133,10 @@ public class AjpProcessor extends AbstractProcessor {
 @Override
 protected final void populateSslRequestAttributes() {
 if (!certificates.isNull()) {
+List jsseCerts = new ArrayList<>();
 ByteChunk certData = certificates.getByteChunk();
-X509Certificate jsseCerts[] = null;
-ByteArrayInputStream bais = new 
ByteArrayInputStream(certData.getBytes(), certData.getStart(),
-certData.getLength());
+ByteArrayInputStream bais =
+new ByteArrayInputStream(certData.getBytes(), 
certData.getStart(), certData.getLength());
 // Fill the elements.
 try {
 CertificateFactory cf;
@@ -1146,21 +1148,13 @@ public class AjpProcessor extends AbstractProcessor {
 }
 while (bais.available() > 0) {
 X509Certificate cert = (X509Certificate) 
cf.generateCertificate(bais);
-if (jsseCerts == null) {
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-} else {
-X509Certificate[] temp = new 
X509Certificate[jsseCerts.length + 1];
-System.arraycopy(jsseCerts, 0, temp, 0, 
jsseCerts.length);
-temp[jsseCerts.length] = cert;
-jsseCerts = temp;
-}
+jsseCerts.add(cert);
 }
 } catch (CertificateException | NoSuchProviderException e) {
 getLog().error(sm.getString("ajpprocessor.certs.fail"), e);
 return;
 }
-request.setAttribute(SSLSupport.CERTIFICATE_KEY, jsseCerts);
+request.setAttribute(SSLSupport.CERTIFICATE_KEY, 
jsseCerts.toArray(new X509Certificate[0]));
 }
 }
 


-
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: Simplify code. Based on PR #651 by wonyongChoi05

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

markt 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 bf9b81c68e Simplify code. Based on PR #651 by wonyongChoi05
bf9b81c68e is described below

commit bf9b81c68e0194a307b85208ae44c9b5eef618ff
Author: Mark Thomas 
AuthorDate: Tue Sep 5 11:22:49 2023 +0100

Simplify code. Based on PR #651 by wonyongChoi05
---
 java/org/apache/coyote/ajp/AjpProcessor.java | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index ccf2e78ba1..9b6063ef33 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -26,9 +26,11 @@ import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -1131,10 +1133,10 @@ public class AjpProcessor extends AbstractProcessor {
 @Override
 protected final void populateSslRequestAttributes() {
 if (!certificates.isNull()) {
+List jsseCerts = new ArrayList<>();
 ByteChunk certData = certificates.getByteChunk();
-X509Certificate jsseCerts[] = null;
-ByteArrayInputStream bais = new 
ByteArrayInputStream(certData.getBytes(), certData.getStart(),
-certData.getLength());
+ByteArrayInputStream bais =
+new ByteArrayInputStream(certData.getBytes(), 
certData.getStart(), certData.getLength());
 // Fill the elements.
 try {
 CertificateFactory cf;
@@ -1146,21 +1148,13 @@ public class AjpProcessor extends AbstractProcessor {
 }
 while (bais.available() > 0) {
 X509Certificate cert = (X509Certificate) 
cf.generateCertificate(bais);
-if (jsseCerts == null) {
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-} else {
-X509Certificate[] temp = new 
X509Certificate[jsseCerts.length + 1];
-System.arraycopy(jsseCerts, 0, temp, 0, 
jsseCerts.length);
-temp[jsseCerts.length] = cert;
-jsseCerts = temp;
-}
+jsseCerts.add(cert);
 }
 } catch (CertificateException | NoSuchProviderException e) {
 getLog().error(sm.getString("ajpprocessor.certs.fail"), e);
 return;
 }
-request.setAttribute(SSLSupport.CERTIFICATE_KEY, jsseCerts);
+request.setAttribute(SSLSupport.CERTIFICATE_KEY, 
jsseCerts.toArray(new X509Certificate[0]));
 }
 }
 


-
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: Simplify code. Based on PR #651 by wonyongChoi05

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 840180fe73 Simplify code. Based on PR #651 by wonyongChoi05
840180fe73 is described below

commit 840180fe730dbaf4c98c9a81c30ee97d77260d32
Author: Mark Thomas 
AuthorDate: Tue Sep 5 11:22:49 2023 +0100

Simplify code. Based on PR #651 by wonyongChoi05
---
 java/org/apache/coyote/ajp/AjpProcessor.java | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index bf2a570d76..2b14407e2c 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -26,8 +26,10 @@ import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -1249,10 +1251,10 @@ public class AjpProcessor extends AbstractProcessor {
 @Override
 protected final void populateSslRequestAttributes() {
 if (!certificates.isNull()) {
+List jsseCerts = new ArrayList<>();
 ByteChunk certData = certificates.getByteChunk();
-X509Certificate jsseCerts[] = null;
-ByteArrayInputStream bais = new 
ByteArrayInputStream(certData.getBytes(), certData.getStart(),
-certData.getLength());
+ByteArrayInputStream bais =
+new ByteArrayInputStream(certData.getBytes(), 
certData.getStart(), certData.getLength());
 // Fill the elements.
 try {
 CertificateFactory cf;
@@ -1264,21 +1266,13 @@ public class AjpProcessor extends AbstractProcessor {
 }
 while (bais.available() > 0) {
 X509Certificate cert = (X509Certificate) 
cf.generateCertificate(bais);
-if (jsseCerts == null) {
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-} else {
-X509Certificate[] temp = new 
X509Certificate[jsseCerts.length + 1];
-System.arraycopy(jsseCerts, 0, temp, 0, 
jsseCerts.length);
-temp[jsseCerts.length] = cert;
-jsseCerts = temp;
-}
+jsseCerts.add(cert);
 }
 } catch (CertificateException | NoSuchProviderException e) {
 getLog().error(sm.getString("ajpprocessor.certs.fail"), e);
 return;
 }
-request.setAttribute(SSLSupport.CERTIFICATE_KEY, jsseCerts);
+request.setAttribute(SSLSupport.CERTIFICATE_KEY, 
jsseCerts.toArray(new X509Certificate[0]));
 }
 }
 


-
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: Simplify code. Based on PR #651 by wonyongChoi05

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7716ebb4bf Simplify code. Based on PR #651 by wonyongChoi05
7716ebb4bf is described below

commit 7716ebb4bf1165fb6b6f46980160f17f1eaba941
Author: Mark Thomas 
AuthorDate: Tue Sep 5 11:22:49 2023 +0100

Simplify code. Based on PR #651 by wonyongChoi05
---
 java/org/apache/coyote/ajp/AjpProcessor.java | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java 
b/java/org/apache/coyote/ajp/AjpProcessor.java
index 0910855da6..8b8ae93cc7 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -26,8 +26,10 @@ import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -1122,10 +1124,10 @@ public class AjpProcessor extends AbstractProcessor {
 @Override
 protected final void populateSslRequestAttributes() {
 if (!certificates.isNull()) {
+List jsseCerts = new ArrayList<>();
 ByteChunk certData = certificates.getByteChunk();
-X509Certificate jsseCerts[] = null;
-ByteArrayInputStream bais = new 
ByteArrayInputStream(certData.getBytes(), certData.getStart(),
-certData.getLength());
+ByteArrayInputStream bais =
+new ByteArrayInputStream(certData.getBytes(), 
certData.getStart(), certData.getLength());
 // Fill the elements.
 try {
 CertificateFactory cf;
@@ -1137,21 +1139,13 @@ public class AjpProcessor extends AbstractProcessor {
 }
 while (bais.available() > 0) {
 X509Certificate cert = (X509Certificate) 
cf.generateCertificate(bais);
-if (jsseCerts == null) {
-jsseCerts = new X509Certificate[1];
-jsseCerts[0] = cert;
-} else {
-X509Certificate[] temp = new 
X509Certificate[jsseCerts.length + 1];
-System.arraycopy(jsseCerts, 0, temp, 0, 
jsseCerts.length);
-temp[jsseCerts.length] = cert;
-jsseCerts = temp;
-}
+jsseCerts.add(cert);
 }
 } catch (CertificateException | NoSuchProviderException e) {
 getLog().error(sm.getString("ajpprocessor.certs.fail"), e);
 return;
 }
-request.setAttribute(SSLSupport.CERTIFICATE_KEY, jsseCerts);
+request.setAttribute(SSLSupport.CERTIFICATE_KEY, 
jsseCerts.toArray(new X509Certificate[0]));
 }
 }
 


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



[GitHub] [tomcat] wonyongChoi05 commented on pull request #651: Refactor SSL certificate population method

2023-09-05 Thread via GitHub


wonyongChoi05 commented on PR #651:
URL: https://github.com/apache/tomcat/pull/651#issuecomment-1706354873

   > The switch to using a wildcard import would need to be reverted as would 
the changes to blank lines between methods. The null check is necessary in some 
form and it is more concise than the alternative proposed in this PR. The 
switch to using an array list has merit. I'll implement that change shortly.
   
   Thank you for your answer.


-- 
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 66005] Apache crashes, if there is a tomcat server, which can not be resolved

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005

Mark Thomas  changed:

   What|Removed |Added

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

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



Buildbot success in on tomcat-11.0.x

2023-09-05 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/558
Blamelist: greeng00se , xxeol2 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch main] 3cbca9ce51cd917aa18034ee212ec6351a2bee6c


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



[Bug 66005] Apache crashes, if there is a tomcat server, which can not be resolved

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005

--- Comment #32 from Michael Osipov  ---
(In reply to Rainer Jung from comment #31)
> I checked the libtool code. It provides the option -export-symbols-regexp,
> which was suggested and which I know committed, and it also provides
> -export-symbols with a file name containing the symbols. The implementation
> in libtool is very similar. It first generates a full symbol list, then
> filters the list (using egrep -e, or egrep) then then calls the linker with
> the result. So the portability of both ways is pretty much the same and
> expected to be good when using libtool. In our case having a separate symbol
> file doesn't seem to be necessary, because the contract between the module
> and the httpd web server is just this one stable symbol name.
> 
> Committed in GH eda74b19e4800e3ed8bb3351d8995d1b3eb44a4d.
> 
> Will be part of 1.2.49.

Then, I am happy with this since libtool will properly abstract from the actual
linker calls. Thank for the investigation!

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



Syntax mod_jk changelog

2023-09-05 Thread Rainer Jung

I saw we use for older versions

  

in the changelog, but since the last version this is missing. Is this an 
oversight, or did we change the style sheet? Should we have the 
"subsection" everywhere or remove everywhere? Any ideas?


Thanks and regards,

Rainer

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



Re: Syntax mod_jk changelog

2023-09-05 Thread Mark Thomas

On 05/09/2023 11:40, Rainer Jung wrote:

I saw we use for older versions

   

in the changelog, but since the last version this is missing. Is this an 
oversight, or did we change the style sheet? Should we have the 
"subsection" everywhere or remove everywhere? Any ideas?


Probably an oversight but I'm not seeing the point of the Native 
sub-section. I'm leaning towards removing it everywhere.


If we wanted to add Common, IIS, httpd sections that could be useful but 
it is also a LOT of work. Nice to have but certainly not essential.


Mark

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



[tomcat-connectors] branch main updated: Fix typo

2023-09-05 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 5720446db Fix typo
5720446db is described below

commit 5720446dbaba042149e15689cc9ca0aa7b4e60c5
Author: Mark Thomas 
AuthorDate: Tue Sep 5 11:53:52 2023 +0100

Fix typo
---
 xdocs/miscellaneous/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 86a637ed8..b38813174 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -129,7 +129,7 @@
 (markt)
   
   
-Common; Update release script for migration to git. (rjung)
+Common: Update release script for migration to git. (rjung)
   
 
   


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



[GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread via GitHub


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

   Hello!
   
   i deleted needless brackets for consistency with the other code.
   
   Thx :D


-- 
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: Syntax mod_jk changelog

2023-09-05 Thread Rainer Jung

Am 05.09.23 um 12:50 schrieb Mark Thomas:

On 05/09/2023 11:40, Rainer Jung wrote:

I saw we use for older versions

   

in the changelog, but since the last version this is missing. Is this 
an oversight, or did we change the style sheet? Should we have the 
"subsection" everywhere or remove everywhere? Any ideas?


Probably an oversight but I'm not seeing the point of the Native 
sub-section. I'm leaning towards removing it everywhere.


If we wanted to add Common, IIS, httpd sections that could be useful but 
it is also a LOT of work. Nice to have but certainly not essential.


Thanks for the quick feedback. Since the subsection use is not 
consistent anyways, we could also switch over to using the more 
meaningful subsections you mentioned. I would like that, especially 
since we already do something similar but not as useful by prefixing the 
entry texts.


I read between the lines, that the style sheet should be agnotic on what 
subsection names we actually use. I'll have a try with adjusting the 
subsections for the last and the forthcoming release and see how well it 
works.


Thanks!

Rainer

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



[tomcat-connectors] branch main updated: Status: Improve XSS hardening. (rjung)

2023-09-05 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 5a6e393f5 Status: Improve XSS hardening. (rjung)
 new 1dd2857a3 Merge branch 'main' of 
https://github.com/apache/tomcat-connectors
5a6e393f5 is described below

commit 5a6e393f5163e1ab23445ecf1ad8ee2e05c964eb
Author: Rainer Jung 
AuthorDate: Tue Sep 5 13:18:34 2023 +0200

Status: Improve XSS hardening. (rjung)
---
 native/common/jk_status.c | 47 ++-
 xdocs/miscellaneous/changelog.xml |  3 +++
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/native/common/jk_status.c b/native/common/jk_status.c
index 4b7dd66cc..f4c23c77e 100644
--- a/native/common/jk_status.c
+++ b/native/common/jk_status.c
@@ -424,6 +424,7 @@ struct status_endpoint
 {
 status_worker_t *worker;
 
+char*req_uri;
 char*query_string;
 jk_map_t*req_params;
 char*msg;
@@ -1136,7 +1137,7 @@ static void status_start_form(jk_ws_service_t *s,
 jk_map_t *m = p->req_params;
 
 if (method)
-jk_printf(s, l, JK_STATUS_FORM_START, method, s->req_uri);
+jk_printf(s, l, JK_STATUS_FORM_START, method, p->req_uri);
 else
 return;
 if (cmd != JK_STATUS_CMD_UNKNOWN) {
@@ -1179,7 +1180,7 @@ static void status_write_uri(jk_ws_service_t *s,
 
 if (text)
 jk_puts(s, "req_uri);
+jk_puts(s, p->req_uri);
 status_get_string(p, JK_STATUS_ARG_FROM, NULL, &arg, l);
 from = status_cmd_int(arg);
 status_get_string(p, JK_STATUS_ARG_CMD, NULL, &arg, l);
@@ -1290,6 +1291,32 @@ static void status_write_uri(jk_ws_service_t *s,
 jk_putv(s, "\">", text, "", NULL);
 }
 
+static int status_unescape_uri(jk_ws_service_t *s,
+   status_endpoint_t *p,
+   jk_log_context_t *l)
+{
+status_worker_t *w = p->worker;
+char *req_uri;
+
+JK_TRACE_ENTER(l);
+
+req_uri = p->req_uri = jk_pool_strdup(s->pool, s->req_uri);
+/* percent decoding */
+if (jk_unescape_url(req_uri, req_uri, -1, NULL, NULL, 1, NULL) != JK_TRUE) 
{
+jk_log(l, JK_LOG_ERROR,
+   "Status worker '%s' could not decode request uri",
+   w->name);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+/* XXX We simply mask special chars in the request uri with '@' to prevent 
cross site scripting */
+while ((req_uri = strpbrk(req_uri, JK_STATUS_ESC_CHARS)))
+req_uri[0] = '@';
+
+JK_TRACE_EXIT(l);
+return JK_TRUE;
+}
+
 static int status_parse_uri(jk_ws_service_t *s,
 status_endpoint_t *p,
 jk_log_context_t *l)
@@ -4777,6 +4804,14 @@ static int JK_METHOD service(jk_endpoint_t *e,
 }
 }
 
+/* Step 0: Unescape request uri and make safe against XSS */
+if (status_unescape_uri(s, p, l) != JK_TRUE) {
+if (is_error)
+*is_error = JK_HTTP_SERVER_ERROR;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+
 /* Step 1: Process GET params and update configuration */
 if (status_parse_uri(s, p, l) != JK_TRUE) {
 err = "Error during parsing of URI";
@@ -5011,7 +5046,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
 if (cmd_props & JK_STATUS_CMD_PROP_REFRESH &&
 refresh > 0) {
 jk_printf(s, l, "\n",
-  refresh, s->req_uri, p->query_string);
+  refresh, p->req_uri, p->query_string);
 }
 if (w->css) {
 jk_putv(s, "\nreq_uri, NULL);
+jk_putv(s, "[req_uri, NULL);
 if (buf && buf[0])
 jk_putv(s, "?", buf, NULL);
 jk_puts(s, "\">Stop auto refresh]");
@@ -5189,7 +5224,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
 jk_log(l, JK_LOG_WARNING, "Status worker '%s': %s", w->name, err);
 if (mime == JK_STATUS_MIME_HTML) {
 jk_putv(s, "Result: ERROR - ", err, "", NULL);
-jk_putv(s, "req_uri, "\">JK Status Manager Start 
Page", NULL);
+jk_putv(s, "req_uri, "\">JK Status Manager Start 
Page", NULL);
 }
 else if (mime == JK_STATUS_MIME_XML) {
 jk_print_xml_start_elt(s, l, w, 2, 0, "result");
@@ -5210,7 +5245,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
 }
 else {
 if (mime == JK_STATUS_MIME_HTML) {
-jk_putv(s, "req_uri, "\">JK Status Manager 
Start Page", NULL);
+jk_putv(s, "req_uri, "\">JK Status Manager 
Start Page", NULL);
 }
 else if (mime == JK_STATUS_MIME_XML) {
 jk_print_xml_start_elt(s, l, w, 2, 0, "result");
diff --git a/xdocs/mi

[tomcat-connectors] branch main updated: Restructure subsections in changelog starting with version 1.2.45.

2023-09-05 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 369da3135 Restructure subsections in changelog starting with version 
1.2.45.
369da3135 is described below

commit 369da31352f63453fb762d30a3cd468ddf9c1125
Author: Rainer Jung 
AuthorDate: Tue Sep 5 13:38:28 2023 +0200

Restructure subsections in changelog starting with version 1.2.45.
---
 xdocs/miscellaneous/changelog.xml | 212 +++---
 1 file changed, 127 insertions(+), 85 deletions(-)

diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index aacd14605..a99f7b050 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,16 @@
   
 
 
+
 
 
   
@@ -41,107 +51,131 @@
   
 
 
-  
-
-  Common: Fix compiler warning when initializing and copying fixed length
-  strings. (rjung)
-
-
-  IIS: Set default request id as a GUID.
-  It can also be taken from an arbitrary request
-  header by configuring "request_id_header". (rjung)
-
-
-  Apache: Retrieve default request id from mod_unique_id.
-  It can also be taken from an arbitrary environment
-  variable by configuring "JkRequestIdIndicator". (rjung)
-
-
-  Common: Add a request id to mod_jk log lines. (rjung)
-
-
-  IIS: Fix non-empty check for the Translate header. (rjung)
-
-
-  Remove support for the Netscape / Sun ONE / Oracle iPlanet Web Server as
-  the product has been retired. (markt)
-
-
-  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)
-
-
-  64878: Common: Enable configure to find the correct sizes for
-  pid_t and pthread_t when building on MacOS. (markt)
-
-
-  Common: Fix Clang 15/16 compatability. Pull request 6 provided 
by
-  Sam James. (markt)
-
-
-  Apache: 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)
-
-
-  Apache: 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)
-
-
-  Status: Improve XSS hardening. (rjung)
-
-  
+  
+
+  
+Retrieve default request id from mod_unique_id.
+It can also be taken from an arbitrary environment
+variable by configuring "JkRequestIdIndicator". (rjung)
+  
+  
+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)
+  
+  
+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)
+  
+
+  
+  
+
+  
+Set default request id as a GUID.
+It can also be taken from an arbitrary request
+header by configuring "request_id_header". (rjung)
+  
+  
+Fix non-empty check for the Translate header. (rjung)
+  
+
+  
+  
+
+  
+Fix compiler warning when initializing and copying fixed length
+strings. (rjung)
+  
+  
+Add a request id to mod_jk log lines. (rjung)
+  
+  
+64878: Enable configure to find the correct sizes for
+pid_t and pthread_t when building on MacOS. (markt)
+  
+  
+Fix Clang 15/16 compatability. Pull request 6 provided by
+Sam James. (markt)
+  
+  
+Improve XSS hardening i status worker. (rjung)
+  
+
+  
+  
+
+  
+Remove support for the Netscape / Sun ONE / Oracle iPlanet Web Server 
as
+the product has been retired. (markt)
+  
+  
+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)
+  
+  
+Restructure subsections in changelog starting with version 1.2.45.
+(rjung)
+  
+
+  
 
 
-  
-
-  IIS: Update the installation how-to to remove windows versions that are 
no
-  longer supported and to add Windows Server 2019. (markt)
-
-  
+  
+
+  
+Update the installation how-to to remove windows versions that are no
+longer supported and to add Windows Server 2019. (markt)
+  
+
+  
 
 
-  
+  
 
   
-Apache: Extend trace level logging of m

Re: Syntax mod_jk changelog

2023-09-05 Thread Rainer Jung

Am 05.09.23 um 13:18 schrieb Rainer Jung:

Am 05.09.23 um 12:50 schrieb Mark Thomas:

On 05/09/2023 11:40, Rainer Jung wrote:

I saw we use for older versions

   

in the changelog, but since the last version this is missing. Is this 
an oversight, or did we change the style sheet? Should we have the 
"subsection" everywhere or remove everywhere? Any ideas?


Probably an oversight but I'm not seeing the point of the Native 
sub-section. I'm leaning towards removing it everywhere.


If we wanted to add Common, IIS, httpd sections that could be useful 
but it is also a LOT of work. Nice to have but certainly not essential.


Thanks for the quick feedback. Since the subsection use is not 
consistent anyways, we could also switch over to using the more 
meaningful subsections you mentioned. I would like that, especially 
since we already do something similar but not as useful by prefixing the 
entry texts.


I read between the lines, that the style sheet should be agnotic on what 
subsection names we actually use. I'll have a try with adjusting the 
subsections for the last and the forthcoming release and see how well it 
works.


Done for a few versions back to show it is feasible for the future.

I can revert, if people don't like it.

Thanks!

Rainer

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



Re: [GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread Han Li
Mark,

I'm not a big fan of this type of PR, this kind of change in the form of a
code change and only a line or two, and I've noticed that the last few PRs
have come from the same place 'woowacourse', which I personally suspect is
what they need to accomplish, eg: task, and since tomcat has a long history
of problems with this form of code, if we allow this kind of change in the
form of a couple of lines of code PR submissions, then I I'm sure there
will be many more of these pointless PRs to show, so I still feel the need
to reject those PRs.


Han

在 2023年9月5日星期二,iamjooon2 (via GitHub)  写道:

>
> iamjooon2 opened a new pull request, #652:
> URL: https://github.com/apache/tomcat/pull/652
>
>Hello!
>
>i deleted needless brackets for consistency with the other code.
>
>Thx :D
>
>
> --
> 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
>
>

-- 
Han Li


Re: [GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread Rémy Maucherat
On Tue, Sep 5, 2023 at 1:48 PM Han Li  wrote:
>
> Mark,
>
> I'm not a big fan of this type of PR, this kind of change in the form of a
> code change and only a line or two, and I've noticed that the last few PRs
> have come from the same place 'woowacourse', which I personally suspect is
> what they need to accomplish, eg: task, and since tomcat has a long history
> of problems with this form of code, if we allow this kind of change in the
> form of a couple of lines of code PR submissions, then I I'm sure there
> will be many more of these pointless PRs to show, so I still feel the need
> to reject those PRs.

+1, as close to zero benefit as it gets, and lots of noise.
Actually, it is not that far fetched that a large bunch of PRs like
this could be used as an attempt to sneak in a harmful change.

Rémy

Rémy

>
> Han
>
> 在 2023年9月5日星期二,iamjooon2 (via GitHub)  写道:
>
> >
> > iamjooon2 opened a new pull request, #652:
> > URL: https://github.com/apache/tomcat/pull/652
> >
> >Hello!
> >
> >i deleted needless brackets for consistency with the other code.
> >
> >Thx :D
> >
> >
> > --
> > 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
> >
> >
>
> --
> Han Li

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



Buildbot retry in on tomcat-9.0.x

2023-09-05 Thread buildbot
Build status: BUILD FAILED: retry lost connection compile (retry)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/665
Blamelist: Mark Thomas 
Build Text: retry lost connection compile (retry)
Status Detected: retry build
Build Source Stamp: [branch 9.0.x] 7716ebb4bf1165fb6b6f46980160f17f1eaba941


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 5


-- ASF Buildbot


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



Re: [GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread Mark Thomas

On 05/09/2023 13:14, Rémy Maucherat wrote:

On Tue, Sep 5, 2023 at 1:48 PM Han Li  wrote:


Mark,

I'm not a big fan of this type of PR, this kind of change in the form of a
code change and only a line or two, and I've noticed that the last few PRs
have come from the same place 'woowacourse', which I personally suspect is
what they need to accomplish, eg: task, and since tomcat has a long history
of problems with this form of code, if we allow this kind of change in the
form of a couple of lines of code PR submissions, then I I'm sure there
will be many more of these pointless PRs to show, so I still feel the need
to reject those PRs.


+1, as close to zero benefit as it gets, and lots of noise.
Actually, it is not that far fetched that a large bunch of PRs like
this could be used as an attempt to sneak in a harmful change.


I'm looking at this purely from a Tomcat perspective. If some students 
are gaming some course to achieve some assessment objective then that is 
an issue for the course to deal with.


I viewed the optimization improvements as worthwhile. I'm generally in 
favour of anything that reduces code volume and/or improves readability.


I take the point that the bracket changes are very trivial but given that:

a) I had spent the time reviewing them and confirming they were valid
and
b) I preferred those instances without the extra brackets

it seemed a waste of effort not to merge the PR.

Note: There are a few cases where I think unnecessary brackets make the 
code easier to read. For example, I know not everyone can read:


a || b && c

and just know that what order things get processed in.

The point about sneaking in a malicious change is valid concern. It 
would certainly be easier to sneak in with a larger volume of changes - 
whether that is one big PR or lots of little PRs.


I do worry that rejecting PRs like this - given we have relatively few 
new contributors - risks alienating potential future committers.


If we are going to reject PRs like this then the rejection message needs 
to be much clearer about why we are rejecting them and to steer them 
towards simple PRs that we would accept.


I think one way to address a lot of these concerns would be to enable 
UnnecessaryParenthesesCheck, fix all the issues we want to fix and 
disable the check for the ones we don't. I'll take a look at this this 
afternoon.


Mark

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



[GitHub] [tomcat] woosung1223 opened a new pull request, #653: remove unnecessary character checking when checking special headers

2023-09-05 Thread via GitHub


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

   Hi there!
   
   I found unnecessary code in the Response class.
   
   Currently, it seems that only headers of Content-Length or Content-Type are 
called Special Headers.
   
   However, as you can see in the code below, `checkSpecialHeader` already 
checks for Content-Type and Content-Length with ignoring cases, so It is not 
necessary to check whether the first letter is c or C in the setHeader or 
addHeader methods.
   
   ```java
   private boolean checkSpecialHeader(String name, String value) {
   // XXX Eliminate redundant fields !!!
   // ( both header and in special fields )
   if (name.equalsIgnoreCase("Content-Type")) {
   setContentType(value);
   return true;
   }
   if (name.equalsIgnoreCase("Content-Length")) {
   try {
  ...
   ```
   
   It's a simple change, but I suggest it because it makes it easier to see the 
flow.


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



[GitHub] [tomcat] xxeol2 opened a new pull request, #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


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

   This PR is closely related to https://github.com/apache/tomcat/pull/649.
   Prevent double execution of the checkFacade() logic when invoking the 
isCommitted() method.
   
   thanks !! 😁


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



[GitHub] [tomcat] ingpyo opened a new pull request, #655: Fix a comment typo

2023-09-05 Thread via GitHub


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

   Hello,
   I have fixed a typo in the Tomcat codebase by changing "CookiePreocessor" to 
"CookieProcessor" for better code clarity and correctness.


-- 
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: [GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread Mark Thomas

On 05/09/2023 14:16, Mark Thomas wrote:

I think one way to address a lot of these concerns would be to enable 
UnnecessaryParenthesesCheck, fix all the issues we want to fix and 
disable the check for the ones we don't. I'll take a look at this this 
afternoon.


I don't think this will work.

There are certainly lots of places where the parentheses are obviously 
unnecessary. However, there are cases for most for the tokens that 
checkstyle checks where we may want to keep the parentheses. These are 
also numerous enough we probably don't want to have to litter the code 
with //CHECKSTYLE:OFF //CHECKSTYLE:ON


We can certainly fix the obvious instances as we find them but a one-off 
global fix with checkstyle and Eclipse formatting looks unlikely.


That brings us back to what to do about the PRs. I understand the 
concerns but I also worry about alienating contributors.


Mark

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



[GitHub] [tomcat] xxeol2 commented on pull request #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


xxeol2 commented on PR #654:
URL: https://github.com/apache/tomcat/pull/654#issuecomment-1706706294

   I'm curious if following code changes would introduce any side effects.
   
   ### Origin
   ```java
   public ServletOutputStream getOutputStream() throws IOException {
   checkFacade();
   ServletOutputStream sos = response.getOutputStream();
   if (isFinished()) {
   response.setSuspended(true);
   }
   return sos;
   }
   
   public PrintWriter getWriter() throws IOException {
   checkFacade();
   PrintWriter writer = response.getWriter();
   if (isFinished()) {
   response.setSuspended(true);
   }
   return writer;
   }
   ```
   
   ### Revised
   ```java
   public ServletOutputStream getOutputStream() throws IOException {
   if (isFinished()) {
   response.setSuspended(true);
   }
   return response.getOutputStream();
   }
   
   public PrintWriter getWriter() throws IOException {
   if (isFinished()) {
   response.setSuspended(true);
   }
   return response.getWriter();
   }
   ```
   


-- 
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: [GitHub] [tomcat] iamjooon2 opened a new pull request, #652: Deleted needless brackets

2023-09-05 Thread Han Li
Mark Thomas  于2023年9月5日周二 21:17写道:

> On 05/09/2023 13:14, Rémy Maucherat wrote:
> > On Tue, Sep 5, 2023 at 1:48 PM Han Li  wrote:
> >>
> >> Mark,
> >>
> >> I'm not a big fan of this type of PR, this kind of change in the form
> of a
> >> code change and only a line or two, and I've noticed that the last few
> PRs
> >> have come from the same place 'woowacourse', which I personally suspect
> is
> >> what they need to accomplish, eg: task, and since tomcat has a long
> history
> >> of problems with this form of code, if we allow this kind of change in
> the
> >> form of a couple of lines of code PR submissions, then I I'm sure there
> >> will be many more of these pointless PRs to show, so I still feel the
> need
> >> to reject those PRs.
> >
> > +1, as close to zero benefit as it gets, and lots of noise.
> > Actually, it is not that far fetched that a large bunch of PRs like
> > this could be used as an attempt to sneak in a harmful change.
>
> I'm looking at this purely from a Tomcat perspective. If some students
> are gaming some course to achieve some assessment objective then that is
> an issue for the course to deal with.
>
> I viewed the optimization improvements as worthwhile. I'm generally in
> favour of anything that reduces code volume and/or improves readability.
>
> I take the point that the bracket changes are very trivial but given that:
>
> a) I had spent the time reviewing them and confirming they were valid
> and
> b) I preferred those instances without the extra brackets
>
+1. Me too.


>
> it seemed a waste of effort not to merge the PR.
>
> Note: There are a few cases where I think unnecessary brackets make the
> code easier to read. For example, I know not everyone can read:
>
> a || b && c
>
> and just know that what order things get processed in.


> The point about sneaking in a malicious change is valid concern. It
> would certainly be easier to sneak in with a larger volume of changes -
> whether that is one big PR or lots of little PRs.
>
> I do worry that rejecting PRs like this - given we have relatively few
> new contributors - risks alienating potential future committers.
>
I have no objection to a PR that change the coding style like this.
1. There are too many of these old code style in Tomcat, I don't like them
either ;), If we accept the PR that change only a little line like this,
one line, then the number of PR are huge.
To me, that's not contributing. That's making noise.
2. From my perspective as a new contributor, this type of PR is indeed very
friendly to new contributors and makes it easy to gain a sense of
participation.
But I think that if I really wanted to contribute code like this, I
wouldn't be able to contribute just one line, because if I really looked at
the code,
it would be easy to see that there's a lot more that needs to be
changed, especially code style.

In summary, I think it is necessary for us to create a PR template on
GitHub, which is more helpful to help new contributors how to submit PRs
correctly.



>
> If we are going to reject PRs like this then the rejection message needs
> to be much clearer about why we are rejecting them and to steer them
> towards simple PRs that we would accept.
>

+1.  Indeed, the way I handled the previous pr was not reasonable.


> I think one way to address a lot of these concerns would be to enable
> UnnecessaryParenthesesCheck, fix all the issues we want to fix and
> disable the check for the ones we don't. I'll take a look at this this
> afternoon.
>
+1

Han


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

-- 
Han Li


[GitHub] [tomcat] markt-asf commented on pull request #652: Remove unnecessary brackets

2023-09-05 Thread via GitHub


markt-asf commented on PR #652:
URL: https://github.com/apache/tomcat/pull/652#issuecomment-1706738930

   We have started to get a lot of PRs removing single instances of unnecessary 
parentheses. While we are generally in favour of this sort of clean-up, one PR 
per instance is not scaleable and will generate a LOT of noise on the mailing 
list.
   
   Automated tools aren't the answer as there are a reasonable proportion of 
these unnecessary parentheses we will want to keep as they aid readability of 
the code.
   
   If you expanded this PR to cover all the classes in the package then that is 
probably at a scale that would be manageable.


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



[GitHub] [tomcat] markt-asf merged pull request #655: Fix a comment typo

2023-09-05 Thread via GitHub


markt-asf merged PR #655:
URL: https://github.com/apache/tomcat/pull/655


-- 
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] branch main updated: Fix a comment typo

2023-09-05 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 ab221875a3 Fix a comment typo
ab221875a3 is described below

commit ab221875a3cd0248ea7a24ab38ed8c699d4d443f
Author: ingpyo 
AuthorDate: Tue Sep 5 22:55:24 2023 +0900

Fix a comment typo

Changed a comment from "// default CookiePreocessor." to "// default 
CookieProcessor." to correct a typo.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index a9ba406047..62307c0210 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2894,7 +2894,7 @@ public class Request implements HttpServletRequest {
 if (context == null) {
 // No context. Possible call from Valve before a Host level
 // context rewrite when no ROOT content is configured. Use the
-// default CookiePreocessor.
+// default CookieProcessor.
 return new Rfc6265CookieProcessor();
 } else {
 return context.getCookieProcessor();


-
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: Fix a comment typo

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

markt 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 a64de1919c Fix a comment typo
a64de1919c is described below

commit a64de1919c157909f899e9b21c6ddceeb6161a1d
Author: ingpyo 
AuthorDate: Tue Sep 5 22:55:24 2023 +0900

Fix a comment typo

Changed a comment from "// default CookiePreocessor." to "// default 
CookieProcessor." to correct a typo.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index a407ecdb79..93be485edd 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2991,7 +2991,7 @@ public class Request implements HttpServletRequest {
 if (context == null) {
 // No context. Possible call from Valve before a Host level
 // context rewrite when no ROOT content is configured. Use the
-// default CookiePreocessor.
+// default CookieProcessor.
 return new Rfc6265CookieProcessor();
 } else {
 return context.getCookieProcessor();


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



[tomcat] branch 9.0.x updated: Fix a comment typo

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 4a0c094925 Fix a comment typo
4a0c094925 is described below

commit 4a0c094925f6362914c32dfa2d964615e3e4441c
Author: ingpyo 
AuthorDate: Tue Sep 5 22:55:24 2023 +0900

Fix a comment typo

Changed a comment from "// default CookiePreocessor." to "// default 
CookieProcessor." to correct a typo.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index a38aad0d23..eb07a8c749 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3041,7 +3041,7 @@ public class Request implements HttpServletRequest {
 if (context == null) {
 // No context. Possible call from Valve before a Host level
 // context rewrite when no ROOT content is configured. Use the
-// default CookiePreocessor.
+// default CookieProcessor.
 return new Rfc6265CookieProcessor();
 } else {
 return context.getCookieProcessor();


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



[tomcat] branch 8.5.x updated: Fix a comment typo

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new d50ad76523 Fix a comment typo
d50ad76523 is described below

commit d50ad76523c43a43b642cb8d8f436ecb42038166
Author: ingpyo 
AuthorDate: Tue Sep 5 22:55:24 2023 +0900

Fix a comment typo

Changed a comment from "// default CookiePreocessor." to "// default 
CookieProcessor." to correct a typo.
---
 java/org/apache/catalina/connector/Request.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 40ec9d9c07..f95095525b 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3056,7 +3056,7 @@ public class Request implements HttpServletRequest {
 if (context == null) {
 // No context. Possible call from Valve before a Host level
 // context rewrite when no ROOT content is configured. Use the
-// default CookiePreocessor.
+// default CookieProcessor.
 return new Rfc6265CookieProcessor();
 } else {
 return context.getCookieProcessor();


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



[GitHub] [tomcat] markt-asf commented on pull request #653: unnecessary work is done before determining if it is a special header

2023-09-05 Thread via GitHub


markt-asf commented on PR #653:
URL: https://github.com/apache/tomcat/pull/653#issuecomment-1706758159

   Those checks were added for performance reasons. They were significantly 
quicker than calling `checkSpecialHeader()`. Unless a benchmark (as a unit 
test) is provided that demonstrates that these checks are unnecessary, this PR 
is unlikely to be merged.


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



[GitHub] [tomcat] markt-asf merged pull request #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


markt-asf merged PR #654:
URL: https://github.com/apache/tomcat/pull/654


-- 
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] branch main updated (ab221875a3 -> ff53af8b69)

2023-09-05 Thread 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.git


from ab221875a3 Fix a comment typo
 add ff53af8b69 Eliminating duplicate execution of checkFacade logic in 
ResponseFacade (#654)

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/connector/ResponseFacade.java | 14 --
 1 file changed, 14 deletions(-)


-
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: Eliminating duplicate execution of checkFacade logic in ResponseFacade (#654)

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

markt 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 a2a9445b16 Eliminating duplicate execution of checkFacade logic in 
ResponseFacade (#654)
a2a9445b16 is described below

commit a2a9445b161008967edbae18d374beead3a59dcf
Author: xxeol2 
AuthorDate: Tue Sep 5 23:46:21 2023 +0900

Eliminating duplicate execution of checkFacade logic in ResponseFacade 
(#654)

Eliminating duplicate execution of checkFacade logic in ResponseFacade
---
 java/org/apache/catalina/connector/ResponseFacade.java | 14 --
 1 file changed, 14 deletions(-)

diff --git a/java/org/apache/catalina/connector/ResponseFacade.java 
b/java/org/apache/catalina/connector/ResponseFacade.java
index b14ee15e7f..db8c65c686 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -195,7 +195,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLength(int len) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -205,7 +204,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLengthLong(long length) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -215,7 +213,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentType(String type) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -244,7 +241,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void flushBuffer() throws IOException {
-checkFacade();
 if (isFinished()) {
 return;
 }
@@ -288,7 +284,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setLocale(Locale loc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -305,7 +300,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addCookie(Cookie cookie) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -360,7 +354,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -375,7 +368,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -390,7 +382,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -400,7 +391,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -410,7 +400,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -420,7 +409,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -430,7 +418,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setStatus(int sc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -498,7 +485,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 
 private void checkCommitted(String messageKey) {
-checkFacade();
 if (isCommitted()) {
 throw new IllegalStateException(sm.getString(messageKey));
 }


-
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: Eliminating duplicate execution of checkFacade logic in ResponseFacade (#654)

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e81815aa16 Eliminating duplicate execution of checkFacade logic in 
ResponseFacade (#654)
e81815aa16 is described below

commit e81815aa163bc40fa070795ee39c70a0755ae8e0
Author: xxeol2 
AuthorDate: Tue Sep 5 23:46:21 2023 +0900

Eliminating duplicate execution of checkFacade logic in ResponseFacade 
(#654)

Eliminating duplicate execution of checkFacade logic in ResponseFacade
---
 java/org/apache/catalina/connector/ResponseFacade.java | 14 --
 1 file changed, 14 deletions(-)

diff --git a/java/org/apache/catalina/connector/ResponseFacade.java 
b/java/org/apache/catalina/connector/ResponseFacade.java
index ba6abba030..97bb870e4a 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -196,7 +196,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLength(int len) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -206,7 +205,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLengthLong(long length) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -216,7 +214,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentType(String type) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -245,7 +242,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void flushBuffer() throws IOException {
-checkFacade();
 if (isFinished()) {
 return;
 }
@@ -289,7 +285,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setLocale(Locale loc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -306,7 +301,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addCookie(Cookie cookie) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -375,7 +369,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -390,7 +383,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -405,7 +397,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -415,7 +406,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -425,7 +415,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -435,7 +424,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -445,7 +433,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setStatus(int sc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -524,7 +511,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 
 private void checkCommitted(String messageKey) {
-checkFacade();
 if (isCommitted()) {
 throw new IllegalStateException(sm.getString(messageKey));
 }


-
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: Eliminating duplicate execution of checkFacade logic in ResponseFacade (#654)

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e92bc0e8e8 Eliminating duplicate execution of checkFacade logic in 
ResponseFacade (#654)
e92bc0e8e8 is described below

commit e92bc0e8e899d663c8bc984fada3d129771dd59c
Author: xxeol2 
AuthorDate: Tue Sep 5 23:46:21 2023 +0900

Eliminating duplicate execution of checkFacade logic in ResponseFacade 
(#654)

Eliminating duplicate execution of checkFacade logic in ResponseFacade
---
 java/org/apache/catalina/connector/ResponseFacade.java | 14 --
 1 file changed, 14 deletions(-)

diff --git a/java/org/apache/catalina/connector/ResponseFacade.java 
b/java/org/apache/catalina/connector/ResponseFacade.java
index c2a8e968b4..6f7b45aafa 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -194,7 +194,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLength(int len) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -204,7 +203,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentLengthLong(long length) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -214,7 +212,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setContentType(String type) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -243,7 +240,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void flushBuffer() throws IOException {
-checkFacade();
 if (isFinished()) {
 return;
 }
@@ -287,7 +283,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setLocale(Locale loc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -304,7 +299,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addCookie(Cookie cookie) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -373,7 +367,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -388,7 +381,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addDateHeader(String name, long date) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -403,7 +395,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -413,7 +404,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addHeader(String name, String value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -423,7 +413,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -433,7 +422,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void addIntHeader(String name, int value) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -443,7 +431,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 @Override
 public void setStatus(int sc) {
-checkFacade();
 if (isCommitted()) {
 return;
 }
@@ -508,7 +495,6 @@ public class ResponseFacade implements HttpServletResponse {
 
 
 private void checkCommitted(String messageKey) {
-checkFacade();
 if (isCommitted()) {
 throw new IllegalStateException(sm.getString(messageKey));
 }


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



[GitHub] [tomcat] markt-asf commented on pull request #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


markt-asf commented on PR #654:
URL: https://github.com/apache/tomcat/pull/654#issuecomment-1706766432

   Nice catch. Tx for the PR.


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



[GitHub] [tomcat] xxeol2 commented on pull request #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


xxeol2 commented on PR #654:
URL: https://github.com/apache/tomcat/pull/654#issuecomment-1706772038

   @markt-asf
   I was wondering if I shouldn't avoid duplicate calls to `checkFacade()` in 
the `getOutputStream()` and `getWriter()` methods! 
https://github.com/apache/tomcat/pull/654#issuecomment-1706706294
   
   Thanks for merging my PR 😁


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



[GitHub] [tomcat] woosung1223 closed pull request #653: unnecessary work is done before determining if it is a special header

2023-09-05 Thread via GitHub


woosung1223 closed pull request #653: unnecessary work is done before 
determining if it is a special header
URL: https://github.com/apache/tomcat/pull/653


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



[GitHub] [tomcat] woosung1223 commented on pull request #653: unnecessary work is done before determining if it is a special header

2023-09-05 Thread via GitHub


woosung1223 commented on PR #653:
URL: https://github.com/apache/tomcat/pull/653#issuecomment-1706779668

   > Those checks were added for performance reasons. They were significantly 
quicker than calling checkSpecialHeader(). Unless a benchmark (as a unit test) 
is provided that demonstrates that these checks are unnecessary, this PR is 
unlikely to be merged.
   
   I hadn't thought of it in terms of performance optimization. 
   
   Thanks! 


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



[GitHub] [tomcat] iamjooon2 closed pull request #652: Remove unnecessary brackets

2023-09-05 Thread via GitHub


iamjooon2 closed pull request #652: Remove unnecessary brackets
URL: https://github.com/apache/tomcat/pull/652


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



Buildbot failure in on tomcat-11.0.x

2023-09-05 Thread buildbot
Build status: BUILD FAILED: failed Snapshot deployed to ASF Maven snapshot 
repository (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/561
Blamelist: xxeol2 
Build Text: failed Snapshot deployed to ASF Maven snapshot repository (failure)
Status Detected: new failure
Build Source Stamp: [branch main] ff53af8b692c179606404d00344511ea7ca8eae3


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 2


-- ASF Buildbot


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



[GitHub] [tomcat] greeng00se opened a new pull request, #656: Optimization when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


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

   Existing code calls getConfiguredSessionCookieName even if the context is 
empty.
   
   In getConfiguredSessionCookieName, only act to get the session cookie if the 
context is non-null.
   
   I think it's possible to avoid calling getConfiguredSessionCookieName and 
use Default defined by spec if context is null.
   
   It's a small optimisation, but I think it saves us one less function call.
   
   The one thing that worries me is about the Priority comment
   
   ```
   // Priority is:
   // 1. Cookie name defined in context
   // 2. Cookie name configured for app
   // 3. Default defined by spec
   ```
   
   For now, I didn't modify that part.


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



[GitHub] [tomcat] greeng00se closed pull request #656: Optimization when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


greeng00se closed pull request #656: Optimization when call 
getSessionCookieName & getSessionUriParamName
URL: https://github.com/apache/tomcat/pull/656


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



[GitHub] [tomcat] markt-asf commented on pull request #654: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


markt-asf commented on PR #654:
URL: https://github.com/apache/tomcat/pull/654#issuecomment-1706867922

   Those refactorings look OK. Please submit another PR for those.


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



[GitHub] [tomcat] xxeol2 opened a new pull request, #657: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


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

   https://github.com/apache/tomcat/pull/654#issuecomment-1706706294
   This was discussed in the comments above!


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



[GitHub] [tomcat] greeng00se commented on pull request #656: Optimization when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


greeng00se commented on PR #656:
URL: https://github.com/apache/tomcat/pull/656#issuecomment-1706941221

   I didn't think about when neither priority 1 nor 2 is present in pr, sorry.


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



[GitHub] [tomcat] Jaeyoung22 opened a new pull request, #658: Unify conditional statement format for some constants in http1 package

2023-09-05 Thread via GitHub


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

   Although I totally agree that there could be some unnecessary parentheses to 
aid the readability of the code, I think that the unity of the code is still 
important for readability.
   
   ### Conditional statements of CR & LF in Http11InputBuffer
   ```java
   // Line 445
   if (prevChr == Constants.CR && chr != Constants.LF) {
   // ...
   }
   
   // Line 544
   } else if (prevChr == Constants.CR && chr == Constants.LF) {
   // ...
   }
   ``` 
   Except for Line 372 that I changed, all conditional statements about CR and 
LF don't have parentheses for each condition.
   
   
   ### Conditional statements in ChunkedInputFilter
   ```java
   // Line 344
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   
   // Line 462
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   
   // Line 551
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   ``` 
   Except for Line 487 and 525 that I changed, all conditional statements about 
constants don't have parentheses for each condition.
   
   
   ### Logic about space and tab in Http11InputBuffer
   ```java
   // Line 395, 453, 974(else if)
   if (chr == Constants.SP || chr == Constants.HT) {
   // …
   }
   
   // Line 419, 515, 935
   if (!(chr == Constants.SP || chr == Constants.HT)) {
   // …
   }
   ``` 
   Because of the above codes, I tried to change Line 1001 of 
Http11InputBuffer, and Line 577 of ChunkedInputFilter. 
   
   


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



[GitHub] [tomcat] parkmuhyeun opened a new pull request, #659: Unify constant delimiters And Refactoring

2023-09-05 Thread via GitHub


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

   ## Description
   
   This PR made the following two modifications
   - Unify constant delimiters
   - Refactoring for better readability
   
   ## Explanation
   
   ### Unify constant delimiters
   
   Constants managed in the Constants class in the coyote package are separated 
by _ for better readability.
   
   The Constants class in the ajp and http2 packages is fine, but the Constants 
class in the coyote and http11 packages has constants that break uniformity, so 
I fixed them.
   - TRANSFERENCODING -> TRASNFER_ENCODING
   - STAGE_ENDINPUT -> STAGE_END_INPUT
   - STAGE_ENDOUTPUT -> STAGE_END_OUTPUT
   - STAGE_KEEPALIVE -> STAGE_KEEP_ALIVE
   
   ### Refactoring for better readability
   
   I found a switch statement in the StatusTransformer class with a magic 
number. I planned to refactor it, thinking it would be more readable if it was 
separated into constants.
   
   I could have used the constants from coyote's Constants class as the comment 
says, but statusTransformer is now in the catalina package, which is a 
different package. So I added the relevant constants to the Constants class in 
the catalina package and used them.
   
   +Also, I noticed that coyote's Constants constants are only used within the 
coyote package.
   
   ## Comments
   
   This is my first PR, so please let me know if there's anything wrong!


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



[GitHub] [tomcat] markt-asf commented on a diff in pull request #657: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


markt-asf commented on code in PR #657:
URL: https://github.com/apache/tomcat/pull/657#discussion_r1316282831


##
java/org/apache/catalina/connector/ResponseFacade.java:
##
@@ -111,23 +111,19 @@ public String getCharacterEncoding() {
 
 @Override
 public ServletOutputStream getOutputStream() throws IOException {
-checkFacade();
-ServletOutputStream sos = response.getOutputStream();
 if (isFinished()) {
 response.setSuspended(true);
 }
-return sos;
+return response.getOutputStream();
 }
 
 
 @Override
 public PrintWriter getWriter() throws IOException {
-checkFacade();
-PrintWriter writer = response.getWriter();
 if (isFinished()) {
 response.setSuspended(true);
 }
-return writer;
+return  response.getWriter();

Review Comment:
   There is an extra space here that needs to be removed.



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



[GitHub] [tomcat] markt-asf commented on a diff in pull request #659: Unify constant delimiters and Refactoring for better readability

2023-09-05 Thread via GitHub


markt-asf commented on code in PR #659:
URL: https://github.com/apache/tomcat/pull/659#discussion_r1316303250


##
java/org/apache/catalina/manager/StatusTransformer.java:
##
@@ -375,33 +375,33 @@ protected static void writeProcessorState(PrintWriter 
writer,
 
 switch (stage) {
 
-case (1/*org.apache.coyote.Constants.STAGE_PARSE*/):
+case (Constants.STAGE_PARSE):

Review Comment:
   Why not use the existing constants (the ones in the comments)?



##
java/org/apache/coyote/Constants.java:
##
@@ -37,9 +37,9 @@ public final class Constants {
 public static final int STAGE_PARSE = 1;
 public static final int STAGE_PREPARE = 2;
 public static final int STAGE_SERVICE = 3;
-public static final int STAGE_ENDINPUT = 4;
-public static final int STAGE_ENDOUTPUT = 5;
-public static final int STAGE_KEEPALIVE = 6;
+public static final int STAGE_END_INPUT = 4;
+public static final int STAGE_END_OUTPUT = 5;
+public static final int STAGE_KEEP_ALIVE = 6;

Review Comment:
   We don't want to change the names of public constants unless we have a 
really good reason. The risk of breaking a third-party integration is too high.



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



[GitHub] [tomcat] parkmuhyeun commented on pull request #659: Unify constant delimiters and Refactoring for better readability

2023-09-05 Thread via GitHub


parkmuhyeun commented on PR #659:
URL: https://github.com/apache/tomcat/pull/659#issuecomment-1707218270

   I reverted the stage constants back and modified the switch statements to 
use the constants that were originally there!


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



[GitHub] [tomcat] greeng00se opened a new pull request, #660: Optimize when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


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

   ### Description
   
   Optimization when call getSessionCookieName & getSessionUriParamName
   
   ### Explanation
   
   Existing code calls getConfiguredSessionCookieName even if the context is 
empty.
   In getConfiguredSessionCookieName, only act to get the session cookie if the 
context is non-null.
   I think it's possible to avoid calling getConfiguredSessionCookieName and 
use Default defined by spec if context is null.
   It's a small optimisation, but I think it saves us one less function call.
   
   Additionally, modified getConfiguredSessionCookieName to not require a null 
check on its result.
   
   ### Comment
   
   One fewer comparison operation if context is non-null. and I think it makes 
the code a little easier to understand for the remaining priority comments.


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



[GitHub] [tomcat] greeng00se commented on pull request #650: Removed unnecessary brackets

2023-09-05 Thread via GitHub


greeng00se commented on PR #650:
URL: https://github.com/apache/tomcat/pull/650#issuecomment-1707230523

   @markt-asf thx for merge my first contribution 😄 


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



[GitHub] [tomcat] greeng00se commented on pull request #656: Optimization when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


greeng00se commented on PR #656:
URL: https://github.com/apache/tomcat/pull/656#issuecomment-1707231871

   sorry. Case 3 is not considered.


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



[GitHub] [tomcat] markt-asf commented on pull request #660: Optimize when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


markt-asf commented on PR #660:
URL: https://github.com/apache/tomcat/pull/660#issuecomment-1707256734

   Saving a single function call is unlikely to make any difference. I'd expect 
the compiler to optimise that.
   
   Changes that reduce duplication and/or improve the readability of the code 
are the ones that are most likely to be applied. If there is a trade-off 
between duplication and readability, the priority will nearly always be 
readability.
   
   In this instance I think you'd be better keeping the null check for context 
in the static method. That further reduces duplication and has the benefit that 
all of the logic is then in a single place and the code would more clearly 
follow the priority order documented in the code.


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



[GitHub] [tomcat] greeng00se commented on pull request #660: Optimize when call getSessionCookieName & getSessionUriParamName

2023-09-05 Thread via GitHub


greeng00se commented on PR #660:
URL: https://github.com/apache/tomcat/pull/660#issuecomment-1707265409

   @markt-asf 
   Thanks for the nice comment.
   I hadn't considered that partial compiler optimisation.
   I agree, readable code should be a priority and I moved the null-check logic 
to a static method...


-- 
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: Mailing list RSS feeds not working

2023-09-05 Thread Mark Thomas

On 21/08/2023 13:17, Mark Thomas wrote:

On 21/08/2023 02:53, Sebastian Lövdahl wrote:

Hi,

I have been using the RSS feeds linked from 
https://tomcat.apache.org/lists.html for following this and other 
Tomcat-related lists 
(https://tomcat.markmail.org/atom/+list:org%2Eapache%2Etomcat%2Edev), 
but it seems like it has stopped working some time during the past 
weeks. I just wanted to let you know in case it hadn't been noticed yet.


Thanks for the email. I noticed the site formatting was broken a few 
weeks ago but assumed it was a temporary error. It appears that 
assumption was incorrect.


I'll try contacting the MarkMail folks to see what is going on. In the 
meantime, I'll hide the markmail links. I hope it is only a temporary 
issue as MarkMail has been my preferred choice for searching the Tomcat 
archives for a very long time.


For the record the MarkMail folks never responded.

Mark

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



RE: Re: Mailing list RSS feeds not working

2023-09-05 Thread Eduardo Guadalupe
https://markmail.org has been permanently shut down and will no longer be
available.
https://stackoverflow.com/questions/76878371/how-do-you-access-markmail

On 2023/09/05 20:37:47 Mark Thomas wrote:
> On 21/08/2023 13:17, Mark Thomas wrote:
> > On 21/08/2023 02:53, Sebastian Lövdahl wrote:
> >> Hi,
> >>
> >> I have been using the RSS feeds linked from
> >> https://tomcat.apache.org/lists.html for following this and other
> >> Tomcat-related lists
> >> (https://tomcat.markmail.org/atom/+list:org%2Eapache%2Etomcat%2Edev),
> >> but it seems like it has stopped working some time during the past
> >> weeks. I just wanted to let you know in case it hadn't been noticed
yet.
> >
> > Thanks for the email. I noticed the site formatting was broken a few
> > weeks ago but assumed it was a temporary error. It appears that
> > assumption was incorrect.
> >
> > I'll try contacting the MarkMail folks to see what is going on. In the
> > meantime, I'll hide the markmail links. I hope it is only a temporary
> > issue as MarkMail has been my preferred choice for searching the Tomcat
> > archives for a very long time.
>
> For the record the MarkMail folks never responded.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


[GitHub] [tomcat] xxeol2 commented on a diff in pull request #657: Eliminating duplicate execution of checkFacade logic in ResponseFacade

2023-09-05 Thread via GitHub


xxeol2 commented on code in PR #657:
URL: https://github.com/apache/tomcat/pull/657#discussion_r1316480032


##
java/org/apache/catalina/connector/ResponseFacade.java:
##
@@ -111,23 +111,19 @@ public String getCharacterEncoding() {
 
 @Override
 public ServletOutputStream getOutputStream() throws IOException {
-checkFacade();
-ServletOutputStream sos = response.getOutputStream();
 if (isFinished()) {
 response.setSuspended(true);
 }
-return sos;
+return response.getOutputStream();
 }
 
 
 @Override
 public PrintWriter getWriter() throws IOException {
-checkFacade();
-PrintWriter writer = response.getWriter();
 if (isFinished()) {
 response.setSuspended(true);
 }
-return writer;
+return  response.getWriter();

Review Comment:
   @markt-asf I removed that extra space! Thank you



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



[GitHub] [tomcat] Jaeyoung22 closed pull request #658: Unify conditional statement format for some constants in http1 package

2023-09-05 Thread via GitHub


Jaeyoung22 closed pull request #658: Unify conditional statement format for 
some constants in http1 package
URL: https://github.com/apache/tomcat/pull/658


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



[GitHub] [tomcat] Jaeyoung22 closed pull request #658: Unify conditional statement format for some constants in http1 package

2023-09-05 Thread via GitHub


Jaeyoung22 closed pull request #658: Unify conditional statement format for 
some constants in http1 package
URL: https://github.com/apache/tomcat/pull/658


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



[GitHub] [tomcat] Jaeyoung22 opened a new pull request, #661: Unify conditional statement format for some constants in http1 package

2023-09-05 Thread via GitHub


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

   Although I totally agree that there could be some unnecessary parentheses to 
aid the readability of the code, I think that the unity of the code is still 
important for readability.
   
   ### Conditional statements of CR & LF in Http11InputBuffer
   ```java
   // Line 445
   if (prevChr == Constants.CR && chr != Constants.LF) {
   // ...
   }
   
   // Line 544
   } else if (prevChr == Constants.CR && chr == Constants.LF) {
   // ...
   }
   ``` 
   Except for Line 372 that I changed, all conditional statements about CR and 
LF don't have parentheses for each condition.
   
   
   ### Conditional statements in ChunkedInputFilter
   ```java
   // Line 344
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   
   // Line 462
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   
   // Line 551
   if (chr == Constants.CR || chr == Constants.LF) {
   // ...
   }
   ``` 
   Except for Line 487 and 525 that I changed, all conditional statements about 
constants don't have parentheses for each condition.
   
   
   ### Logic about space and tab in Http11InputBuffer
   ```java
   // Line 395, 453, 974(else if)
   if (chr == Constants.SP || chr == Constants.HT) {
   // ...
   }
   
   // Line 419, 515, 935
   if (!(chr == Constants.SP || chr == Constants.HT)) {
   // ...
   }
   ``` 
   Because of the above codes, I tried to change Line 1001 of 
Http11InputBuffer, and Line 577 of ChunkedInputFilter. 
   
   


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



[GitHub] [tomcat] parkmuhyeun commented on pull request #659: Unify constant delimiters and Refactoring for better readability

2023-09-05 Thread via GitHub


parkmuhyeun commented on PR #659:
URL: https://github.com/apache/tomcat/pull/659#issuecomment-1707461772

   Oh, sorry. I missed that one! I've fixed 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



[GitHub] [tomcat] iamjooon2 closed pull request #652: Remove unnecessary brackets

2023-09-05 Thread via GitHub


iamjooon2 closed pull request #652: Remove unnecessary brackets
URL: https://github.com/apache/tomcat/pull/652


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



[GitHub] [tomcat] iamjooon2 commented on pull request #652: Remove unnecessary brackets

2023-09-05 Thread via GitHub


iamjooon2 commented on PR #652:
URL: https://github.com/apache/tomcat/pull/652#issuecomment-1707507180

   @markt-asf I just saw [!This PR](https://github.com/apache/tomcat/pull/650) 
and removed some brackets too
   
   Regret for comment 'Automated tools'😕


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



[GitHub] [tomcat] Jaeyoung22 commented on pull request #658: Unify conditional statement format for some constants in http1 package

2023-09-05 Thread via GitHub


Jaeyoung22 commented on PR #658:
URL: https://github.com/apache/tomcat/pull/658#issuecomment-1707535138

   This Pull Request UNINTENTIONALLY sended because of github incident :( So I 
closed this PR and resend.


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



[GitHub] [tomcat] wonyongChoi05 opened a new pull request, #662: Simplify and enhance charset extraction from content type

2023-09-05 Thread via GitHub


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

   Hello! Thank you for the PR. Upon reviewing these changes, I've noticed a 
significant improvement in code readability. This enhanced readability stands 
out and will make a substantial difference in maintaining and debugging the 
code, as well as facilitating collaboration among developers.
   
   I believe that this change elevates code quality and simplifies maintenance. 
By simplifying and making the code more straightforward, we can prevent errors 
and enhance code comprehensibility.
   
   Once again, thank you for your contribution to this effort. If there are any 
additional improvements or if you need any further feedback, please feel free 
to let me know!


-- 
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 67235] New: NPE (NullPointerException) occurs in AsyncContextImpl.decrementInProgressAsyncCount after version 10.1.12.

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67235

Bug ID: 67235
   Summary: NPE (NullPointerException) occurs in
AsyncContextImpl.decrementInProgressAsyncCount after
version 10.1.12.
   Product: Tomcat 10
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: brigh...@toss.im
  Target Milestone: --

The error log "java.lang.NullPointerException: Cannot invoke
'org.apache.catalina.Context.decrementInProgressAsyncCount()' because
'this.context' is null" occurs in
AsyncContextImpl.decrementInProgressAsyncCount when using Tomcat version
10.1.12 and later. This issue occurs when using SSE (Server-Sent Events).
Specifically, it always happens when the client terminates the connection
first, and the server then tries to send data. The issue occurs in both
versions 10.1.12 and 10.1.13, but it does not occur in version 10.1.11.

Below is the attached stack trace.


```
java.lang.NullPointerException: Cannot invoke
"org.apache.catalina.Context.decrementInProgressAsyncCount()" because
"this.context" is null
at
org.apache.catalina.core.AsyncContextImpl.decrementInProgressAsyncCount(AsyncContextImpl.java:441)
at
org.apache.coyote.AsyncStateMachine.asyncPostProcess(AsyncStateMachine.java:295)
at
org.apache.coyote.AbstractProcessor.asyncPostProcess(AbstractProcessor.java:197)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:78)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:894)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1740)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52)
at
org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
at
org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.base/java.lang.Thread.run(Thread.java:833)
```

-- 
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 67235] NPE (NullPointerException) occurs in AsyncContextImpl.decrementInProgressAsyncCount after version 10.1.12.

2023-09-05 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67235

brigh...@toss.im changed:

   What|Removed |Added

 OS||All
   Hardware|PC  |All

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



  1   2   >