[Bug 66602] TCP abnormal shutdown during pressure testing based on HTTP2 (h2c)

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

--- Comment #3 from Mark Thomas  ---
If you want a guaranteed SLA, you'll have to pay for it.

I can't speak for the other committers but I have been preparing for a
conference this week. I was planning on looking at this next week unless
someone else gets there first.

This will get looked at (and fixed if necessary) between now and the June
releases.

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



Re: Tomcat 11 - minimum Java version

2023-05-18 Thread Rémy Maucherat
On Thu, May 18, 2023, 06:50 Mark Thomas  wrote:

>
> 17 May 2023 20:37:01 Christopher Schultz :
>
> > On 5/17/23 04:52, Mark Thomas wrote:
>
> >> Once we switch to using Panama, we are going to have to figure out how
> >> to handle this. My primary concern is new features that depend on API
> >> calls only present in newer OpenSSL versions.
> >
> > The Java components can query the OpenSSL API level from the library
> > and make decisions based on that. It won't be a compile-time decision
> > any more, which IMO is actually a good thing.
>
> Ah, I didn't know that. Nice. I need to read up on Panama.
>

The code actually supports both OpenSSL 1.1 and 3.0 (for fips im
particular, but there are a couple others due to macros not working), as an
experiment on how to deal with differences. Works good (at runtime, not at
compile time).

Also in other news, Panama is confirmed as preview in Java 21, so I'm
disappointed.

Rémy

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


[Bug 66602] TCP abnormal shutdown during pressure testing based on HTTP2 (h2c)

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

--- Comment #4 from Mark Thomas  ---
As per RFC 9113, section 6.9 it is not legal to send a WINDOW_UPDATE frame of
length zero.

I've had a quick look at the code it should be a simple fix to skip sending the
WINDOW_UPDATE frame if the increment is zero.

-- 
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 66602] TCP abnormal shutdown during pressure testing based on HTTP2 (h2c)

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

--- Comment #5 from Mark Thomas  ---
Could you be tempted into submitting a patch or PR for this? (Don't forget the
change log.)

-- 
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] neo-ytx opened a new pull request, #617: #MessageBytes toString rollback

2023-05-18 Thread via GitHub


neo-ytx opened a new pull request, #617:
URL: https://github.com/apache/tomcat/pull/617

   1. I think toString method should not change the object's status. Because 
this method is used for return a String. Most people think they can get 
object's stringValue from this method, and will not change the object's status.
   2. The issue I found: After I integrate openTelemetry with my tomcat web 
services, the service always return 404. The openTelemetry use the toString 
method, then tomcat think it is a str not byte and return 404 error.


-- 
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] Chaohua95 opened a new pull request, #618: Update MERGE.txt

2023-05-18 Thread via GitHub


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

   test


-- 
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] Chaohua95 closed pull request #618: Update MERGE.txt

2023-05-18 Thread via GitHub


Chaohua95 closed pull request #618: Update MERGE.txt
URL: https://github.com/apache/tomcat/pull/618


-- 
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 66604] New: Tomcat 9.0.75 Linux process not getting stopped after running shutdown.sh

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

Bug ID: 66604
   Summary: Tomcat 9.0.75 Linux process not getting stopped after
running shutdown.sh
   Product: Tomcat 9
   Version: 9.0.75
  Hardware: Other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: rajeshmullavalap...@gmail.com
  Target Milestone: -

OS - ALMA linux, Tomcat version 9.0.75, Linux process not getting stopped after
running shutdown.sh or catalina stop [-force].  The process still exists on the
server attached to a PID. Subsequent starting of tomcat will result in new
processes. 

If JMX parameters are used this will result in failure to start the tomcat next
time, since this will not stop the binding of JMX  port as well. 

Parameters used in setenv.sh -   
export CATALINA_OPTS="-server -Xms2g -Xmx5g -XX:MaxMetaspaceSize=512m
-Doracle.jdbc.autoCommitSpecCompliant=false



Logfile info after stopping - 
 INFO [main] org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["http-nio-8380"]
 INFO [main] org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["https-jsse-nio-8343"]
 INFO [main] org.apache.coyote.AbstractProtocol.stop Stopping ProtocolHandler
["ajp-nio-0:0:0:0:0:0:0:1-8309"]
 INFO [main] org.apache.coyote.AbstractProtocol.destroy Destroying
ProtocolHandler ["http-nio-8380"]
 INFO [main] org.apache.coyote.AbstractProtocol.destroy Destroying
ProtocolHandler ["https-jsse-nio-8343"]
 INFO [main] org.apache.coyote.AbstractProtocol.destroy Destroying
ProtocolHandler ["ajp-nio-0:0:0:0:0:0:0:1-8309"]

-- 
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] aooohan commented on pull request #615: Add a reset method to release reference

2023-05-18 Thread via GitHub


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

   I've look at this, I think this change is a bit complicated. Resetting the 
channel while closing it is ok.


-- 
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: Clear SocketWrapper reference to help GC

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 10492dd22b Clear SocketWrapper reference to help GC
10492dd22b is described below

commit 10492dd22bd64ff63cf77786fa67d45cdc2a54b3
Author: lihan 
AuthorDate: Fri May 19 11:24:27 2023 +0800

Clear SocketWrapper reference to help GC
---
 java/org/apache/coyote/AbstractProcessor.java  | 3 +++
 java/org/apache/coyote/http11/Http11Processor.java | 1 -
 java/org/apache/coyote/http2/StreamProcessor.java  | 6 +-
 java/org/apache/tomcat/util/net/Nio2Channel.java   | 1 +
 java/org/apache/tomcat/util/net/NioChannel.java| 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

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


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



[tomcat] branch 10.1.x updated: Clear SocketWrapper reference to help GC

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 2b65532caf Clear SocketWrapper reference to help GC
2b65532caf is described below

commit 2b65532cafe4b9eedb588b45aa8570cfc03c165e
Author: lihan 
AuthorDate: Fri May 19 11:24:27 2023 +0800

Clear SocketWrapper reference to help GC

(cherry picked from commit 10492dd22bd64ff63cf77786fa67d45cdc2a54b3)
---
 java/org/apache/coyote/AbstractProcessor.java  | 3 +++
 java/org/apache/coyote/http11/Http11Processor.java | 1 -
 java/org/apache/coyote/http2/StreamProcessor.java  | 6 +-
 java/org/apache/tomcat/util/net/Nio2Channel.java   | 1 +
 java/org/apache/tomcat/util/net/NioChannel.java| 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index ece5a6abda..d14224702c 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -717,6 +717,9 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 public void recycle() {
 errorState = ErrorState.NONE;
 asyncStateMachine.recycle();
+// Clear fields that can be cleared to aid GC and trigger NPEs if this
+// is reused
+socketWrapper = null;
 }
 
 
diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index db2286d2b0..cb03b4fa41 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1420,7 +1420,6 @@ public class Http11Processor extends AbstractProcessor {
 inputBuffer.recycle();
 outputBuffer.recycle();
 upgradeToken = null;
-socketWrapper = null;
 sendfileData = null;
 sslSupport = null;
 }
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
b/java/org/apache/coyote/http2/StreamProcessor.java
index d08c875cbd..f76fbfa788 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -385,8 +385,8 @@ class StreamProcessor extends AbstractProcessor {
 
 @Override
 public final void recycle() {
+super.recycle();
 // StreamProcessor instances are not re-used.
-
 // Calling removeRequestProcessor even though the RequestProcesser was
 // never added will add the values from the RequestProcessor to the
 // running total for the GlobalRequestProcessor
@@ -394,10 +394,6 @@ class StreamProcessor extends AbstractProcessor {
 if (global != null) {
 global.removeRequestProcessor(request.getRequestProcessor());
 }
-
-// Clear fields that can be cleared to aid GC and trigger NPEs if this
-// is reused
-setSocketWrapper(null);
 }
 
 
diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java 
b/java/org/apache/tomcat/util/net/Nio2Channel.java
index 603c43f416..9d65266374 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -79,6 +79,7 @@ public class Nio2Channel implements AsynchronousByteChannel {
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc, null);
 }
 
 
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
b/java/org/apache/tomcat/util/net/NioChannel.java
index d263ce9ae6..eae3f51171 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -81,6 +81,7 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc,null);
 }
 
 /**


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



[tomcat] branch 9.0.x updated: Clear SocketWrapper reference to help GC

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

lihan 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 2cb6f8e468 Clear SocketWrapper reference to help GC
2cb6f8e468 is described below

commit 2cb6f8e4681359087a2a52b6950a315383a8d422
Author: lihan 
AuthorDate: Fri May 19 11:24:27 2023 +0800

Clear SocketWrapper reference to help GC

(cherry picked from commit 10492dd22bd64ff63cf77786fa67d45cdc2a54b3)
---
 java/org/apache/coyote/AbstractProcessor.java  | 3 +++
 java/org/apache/coyote/http11/Http11Processor.java | 1 -
 java/org/apache/coyote/http2/StreamProcessor.java  | 6 +-
 java/org/apache/tomcat/util/net/Nio2Channel.java   | 1 +
 java/org/apache/tomcat/util/net/NioChannel.java| 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index a49bc921cf..0230a5d442 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -716,6 +716,9 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 public void recycle() {
 errorState = ErrorState.NONE;
 asyncStateMachine.recycle();
+// Clear fields that can be cleared to aid GC and trigger NPEs if this
+// is reused
+socketWrapper = null;
 }
 
 
diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index aab2290407..9070b9727c 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1419,7 +1419,6 @@ public class Http11Processor extends AbstractProcessor {
 inputBuffer.recycle();
 outputBuffer.recycle();
 upgradeToken = null;
-socketWrapper = null;
 sendfileData = null;
 sslSupport = null;
 }
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java 
b/java/org/apache/coyote/http2/StreamProcessor.java
index fd1e011bea..e1ed635e8d 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -391,8 +391,8 @@ class StreamProcessor extends AbstractProcessor {
 
 @Override
 public final void recycle() {
+super.recycle();
 // StreamProcessor instances are not re-used.
-
 // Calling removeRequestProcessor even though the RequestProcesser was
 // never added will add the values from the RequestProcessor to the
 // running total for the GlobalRequestProcessor
@@ -400,10 +400,6 @@ class StreamProcessor extends AbstractProcessor {
 if (global != null) {
 global.removeRequestProcessor(request.getRequestProcessor());
 }
-
-// Clear fields that can be cleared to aid GC and trigger NPEs if this
-// is reused
-setSocketWrapper(null);
 }
 
 
diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java 
b/java/org/apache/tomcat/util/net/Nio2Channel.java
index a2612fd0c1..6040b8855e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -79,6 +79,7 @@ public class Nio2Channel implements AsynchronousByteChannel {
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc, null);
 }
 
 
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
b/java/org/apache/tomcat/util/net/NioChannel.java
index 8e3cb4f0e1..777880d67d 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -99,6 +99,7 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc,null);
 }
 
 /**


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



[tomcat] branch 8.5.x updated: Clear SocketWrapper reference to help GC

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

lihan 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 2a084c266e Clear SocketWrapper reference to help GC
2a084c266e is described below

commit 2a084c266e09b048c1a49c749cb8ab1e8feedbfc
Author: lihan 
AuthorDate: Fri May 19 11:24:27 2023 +0800

Clear SocketWrapper reference to help GC
---
 java/org/apache/coyote/AbstractProcessor.java  | 3 +++
 java/org/apache/coyote/http11/Http11Processor.java | 1 -
 java/org/apache/tomcat/util/net/Nio2Channel.java   | 1 +
 java/org/apache/tomcat/util/net/NioChannel.java| 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/AbstractProcessor.java 
b/java/org/apache/coyote/AbstractProcessor.java
index 2a28d683ed..0295396112 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -709,6 +709,9 @@ public abstract class AbstractProcessor extends 
AbstractProcessorLight implement
 public void recycle() {
 errorState = ErrorState.NONE;
 asyncStateMachine.recycle();
+// Clear fields that can be cleared to aid GC and trigger NPEs if this
+// is reused
+socketWrapper = null;
 }
 
 
diff --git a/java/org/apache/coyote/http11/Http11Processor.java 
b/java/org/apache/coyote/http11/Http11Processor.java
index b8705441e8..5cc2ecc752 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -1612,7 +1612,6 @@ public class Http11Processor extends AbstractProcessor {
 inputBuffer.recycle();
 outputBuffer.recycle();
 upgradeToken = null;
-socketWrapper = null;
 sendfileData = null;
 }
 
diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java 
b/java/org/apache/tomcat/util/net/Nio2Channel.java
index a2612fd0c1..6040b8855e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Channel.java
+++ b/java/org/apache/tomcat/util/net/Nio2Channel.java
@@ -79,6 +79,7 @@ public class Nio2Channel implements AsynchronousByteChannel {
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc, null);
 }
 
 
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java 
b/java/org/apache/tomcat/util/net/NioChannel.java
index 8e3cb4f0e1..777880d67d 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -99,6 +99,7 @@ public class NioChannel implements ByteChannel, 
ScatteringByteChannel, Gathering
 @Override
 public void close() throws IOException {
 sc.close();
+reset(this.sc,null);
 }
 
 /**


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



[GitHub] [tomcat] aooohan commented on pull request #615: Add a reset method to release reference

2023-05-18 Thread via GitHub


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

   I've done this and also cleared up reference elsewhere.


-- 
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 #615: Add a reset method to release reference

2023-05-18 Thread via GitHub


aooohan closed pull request #615: Add a reset method to release reference
URL: https://github.com/apache/tomcat/pull/615


-- 
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 #617: #MessageBytes toString rollback

2023-05-18 Thread via GitHub


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

   Hmm. A similar issue has been raised by other user before, look this 
https://lists.apache.org/list?us...@tomcat.apache.org:2023-3:openTelemetry
   
   Hope this helps.


-- 
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-05-18 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/112/builds/380
Blamelist: lihan 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch main] 10492dd22bd64ff63cf77786fa67d45cdc2a54b3


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] ledefe opened a new pull request, #619: Fix Bug 66602: not sending WINDOW_UPDATE when dataLength is ZERO on call SwallowedDataFramePayload

2023-05-18 Thread via GitHub


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

   (no comment)


-- 
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 66602] TCP abnormal shutdown during pressure testing based on HTTP2 (h2c)

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

--- Comment #6 from ledefe <517893...@qq.com> ---
A PR has been submitted based on the 9.0.x branch 

PR: https://github.com/apache/tomcat/pull/619

-- 
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] aooohan commented on a diff in pull request #619: Fix Bug 66602: not sending WINDOW_UPDATE when dataLength is ZERO on call SwallowedDataFramePayload

2023-05-18 Thread via GitHub


aooohan commented on code in PR #619:
URL: https://github.com/apache/tomcat/pull/619#discussion_r1198570360


##
webapps/docs/changelog.xml:
##
@@ -125,6 +125,9 @@
 defined in RFC 9218 rather than the one defined in RFC 7540.
 (markt)
   
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO on 
call SwallowedDataFramePayload.

Review Comment:
   Please add your name after this entry. Like this (your name)



-- 
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 a diff in pull request #619: Fix Bug 66602: not sending WINDOW_UPDATE when dataLength is ZERO on call SwallowedDataFramePayload

2023-05-18 Thread via GitHub


aooohan commented on code in PR #619:
URL: https://github.com/apache/tomcat/pull/619#discussion_r1198570360


##
webapps/docs/changelog.xml:
##
@@ -125,6 +125,9 @@
 defined in RFC 9218 rather than the one defined in RFC 7540.
 (markt)
   
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO on 
call SwallowedDataFramePayload.

Review Comment:
   ~~Please add your name after this entry. Like this (your name)~~



-- 
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 BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is zero.

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 5af5af674f Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the 
increment is zero.
5af5af674f is described below

commit 5af5af674f74bc88febc5cd5dc06213de516eb3e
Author: lihan 
AuthorDate: Fri May 19 14:06:09 2023 +0800

Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is 
zero.

Closes #619
https://bz.apache.org/bugzilla/show_bug.cgi?id=66602
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 webapps/docs/changelog.xml| 9 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 46f3eee022..d890945452 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1522,7 +1522,9 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 // the call to this method. This means the bytes read will have 
been
 // written to the original stream and, effectively, swallowed.
 // Therefore, need to notify that those bytes were swallowed here.
-onSwallowedDataFramePayload(streamId, dataLength);
+if (dataLength > 0) {
+onSwallowedDataFramePayload(streamId, dataLength);
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d5a96ce78c..e37c67094b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,15 @@
   
 
   
+  
+
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO
+on call SwallowedDataFramePayload. Pull request #619 by
+ledefe. (lihan)
+  
+
+  
   
 
   


-
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 #619: Fix Bug 66602: not sending WINDOW_UPDATE when dataLength is ZERO on call SwallowedDataFramePayload

2023-05-18 Thread via GitHub


aooohan closed pull request #619: Fix Bug 66602: not sending WINDOW_UPDATE when 
dataLength is ZERO on call SwallowedDataFramePayload
URL: https://github.com/apache/tomcat/pull/619


-- 
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 10.1.x updated: Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is zero.

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 7b417e313e Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the 
increment is zero.
7b417e313e is described below

commit 7b417e313e419f55459d90af7a713578359ac853
Author: ledefe 
AuthorDate: Fri May 19 13:24:50 2023 +0800

Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is 
zero.

Closes #619
https://bz.apache.org/bugzilla/show_bug.cgi?id=66602
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 webapps/docs/changelog.xml| 5 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 0e280deb45..ec3e098c0d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1522,7 +1522,9 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 // the call to this method. This means the bytes read will have 
been
 // written to the original stream and, effectively, swallowed.
 // Therefore, need to notify that those bytes were swallowed here.
-onSwallowedDataFramePayload(streamId, dataLength);
+if (dataLength>0) {
+onSwallowedDataFramePayload(streamId, dataLength);
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f38a017f6d..57d5bc3c11 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,11 @@
 defined in RFC 9218 rather than the one defined in RFC 7540.
 (markt)
   
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO
+on call SwallowedDataFramePayload. Pull request #619 by
+ledefe. (lihan)
+  
 
   
   


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



[tomcat] branch 9.0.x updated: Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is zero.

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

lihan 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 eb51363de4 Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the 
increment is zero.
eb51363de4 is described below

commit eb51363de43e2b1c16ecc48cd968a9a497374576
Author: ledefe 
AuthorDate: Fri May 19 13:24:50 2023 +0800

Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is 
zero.

Closes #619
https://bz.apache.org/bugzilla/show_bug.cgi?id=66602
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 webapps/docs/changelog.xml| 5 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 63586fc756..e653611498 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1514,7 +1514,9 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 // the call to this method. This means the bytes read will have 
been
 // written to the original stream and, effectively, swallowed.
 // Therefore, need to notify that those bytes were swallowed here.
-onSwallowedDataFramePayload(streamId, dataLength);
+if (dataLength>0) {
+onSwallowedDataFramePayload(streamId, dataLength);
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9413908290..978c599ab9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,11 @@
 defined in RFC 9218 rather than the one defined in RFC 7540.
 (markt)
   
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO
+on call SwallowedDataFramePayload. Pull request #619 by
+ledefe. (lihan)
+  
 
   
   


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



[tomcat] branch 8.5.x updated: Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is zero.

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

lihan 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 338aaec1f3 Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the 
increment is zero.
338aaec1f3 is described below

commit 338aaec1f37984e8d8bef11a79ca929128e509ec
Author: ledefe 
AuthorDate: Fri May 19 13:24:50 2023 +0800

Fix BZ 66602 - skip sending the WINDOW_UPDATE frame if the increment is 
zero.

Closes #619
https://bz.apache.org/bugzilla/show_bug.cgi?id=66602
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 webapps/docs/changelog.xml| 5 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index c5aeaf87ea..b32b9dbbfb 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1625,7 +1625,9 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 // the call to this method. This means the bytes read will have 
been
 // written to the original stream and, effectively, swallowed.
 // Therefore, need to notify that those bytes were swallowed here.
-onSwallowedDataFramePayload(streamId, dataLength);
+if (dataLength>0) {
+onSwallowedDataFramePayload(streamId, dataLength);
+}
 }
 }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a04e745926..6a2afaa8b7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
 defined in RFC 9218 rather than the one defined in RFC 7540.
 (markt)
   
+  
+66602: not sending WINDOW_UPDATE when dataLength is ZERO
+on call SwallowedDataFramePayload. Pull request #619 by
+ledefe. (lihan)
+  
 
   
   


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



[Bug 66602] TCP abnormal shutdown during pressure testing based on HTTP2 (h2c)

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

Han Li  changed:

   What|Removed |Added

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

--- Comment #7 from Han Li  ---
Thanks for the report and PR.

Fixed in:
- 11.0.x for 11.0.0-M7 onwards
- 10.1.x for 10.1.10 onwards
- 9.0.x for 9.0.76 onwards
- 8.5.x for 8.5.90 onwards

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