[GitHub] [tomcat] rmannibucau opened a new pull request #414: don't log undesired warnings for webapp classloader configuration

[GitBox]

rmannibucau opened a new pull request #414:
URL: https://github.com/apache/tomcat/pull/414


   



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.

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] efge edited a comment on pull request #406: Improve the SSLValve so it is able to handle the ssl_client_escaped_cert header from Nginx

[GitBox]

efge edited a comment on pull request #406:
URL: https://github.com/apache/tomcat/pull/406#issuecomment-801276629


   (force-pushed to rebase and update correct section of changelog.xml after 
latest release)



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.

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] efge commented on pull request #406: Improve the SSLValve so it is able to handle the ssl_client_escaped_cert header from Nginx

[GitBox]

efge commented on pull request #406:
URL: https://github.com/apache/tomcat/pull/406#issuecomment-801276629


   (force-pushed to rebase and update correct section of changelog.xml)



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.

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: Release Announcement: General Availability of Java 16 / JDK 16

[Martin Grigorov]

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 16 16+36-2231
and 17-ea+13-1000 on both Linux x86_64 and aarch64!

Regards,
Martin

On Tue, Mar 16, 2021 at 5:26 PM Rory O'Donnell 
wrote:

>
> Hi Mark,
>
> *Release Announcement: General Availability of Java 16 / JDK 16 *
>
> **
>
>   * JDK 16, the reference implementation of Java 16, is now Generally
> Available. [1]
>   * GPL-licensed OpenJDK builds from Oracle are available here:
> http://jdk.java.net/16/ 
>   * JDK 16 Release notes
> 
>
> *JDK 16 includes the following features [2]:*
>
>   * JEP 338:Vector API (Incubator) 
>   * JEP 347:Enable C++14 Language Features
> 
>   * JEP 357:Migrate from Mercurial to Git
> 
>   * JEP 369:Migrate to GitHub 
>   * JEP 376:ZGC: Concurrent Thread-Stack Processing
> 
>   * JEP 380:Unix-Domain Socket Channels  >
>   * JEP 386:Alpine Linux Port 
>   * JEP 387:Elastic Metaspace 
>   * JEP 388:Windows/AArch64 Port 
>   * JEP 389:Foreign Linker API (Incubator)
> 
>   * JEP 390:Warnings for Value-Based Classes
> 
>   * JEP 392:Packaging Tool 
>   * JEP 393:Foreign-Memory Access API (Third Incubator)
> 
>   * JEP 394:Pattern Matching for instanceof
> 
>   * JEP 395:Records 
>   * JEP 396:Strongly Encapsulate JDK Internals by Default
> 
>   * JEP 397:Sealed Classes (Second Preview)
> 
>
> Thanks to everyone who contributed to JDK 16, whether by creating
> features or enhancements, logging bugs, or
>
> downloading and testing the early-access builds.
>
> *OpenJDK 17 Early Access build 13 is now available at
> http://jdk.java.net/17 
> *
>
>
> **
>
>   * These early access, open source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>   * JEPs targeted to JDK 17, so far:
>   o JEP 356: Enhanced Pseudo-Random Number Generators
> 
>
>   * Release Notes are available at http://jdk.java.net/17/release-notes
> 
>
>   * Significant changes since the last availability email:
>   o JDK-8259709: Disable SHA-1 XML Signatures (b13)
>   o JDK-6323374: (coll) Optimize Collections.unmodifiable* and
> synchronized*(b13)
>   o JDK-8139348: Deprecate 3DES and RC4 in Kerberos (b12)
>   o JDK-8259662: Don't wrap SocketExceptions into SSLExceptions in
> SSLSocketImpl (b11)
>   o JDK-8235139: Deprecate the socket impl factory mechanism(b10)
>   o JDK-8225081: Remove Telia Company CA certificate expiring in
> April 2021(b9)
>
>
> *Project Lanai Early-Access Builds
> *
>
>   * EA 10 Build 17-lanai+3-133 (2021/3/2) is available -
> http://jdk.java.net/lanai/
>   * These early access, open source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>
>
> *Project Loom Early-Access Builds*
>
>   * Build 17-loom+4-174 (2021/3/12) is available -
> http://jdk.java.net/loom/
>   * These early access, open source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>
>
> *Project Panama Early-Access Builds
> *
>
>   * Build 17-panama+2-51 (2021/2/12) is available -
> http://jdk.java.net/panama/
>   * These early access, open source builds are provided under the GNU
> General Public License, version 2, with the Classpath Exception
> .
>
>
> Rgds,Rory
>
> [1] https://mail.openjdk.java.net/pipermail/jdk-dev/2021-March/005188.html
>
> [2] https://openjdk.java.net/projects/jdk/16/
> 
>
>

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5738

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] fc30f97326862af3a577b1c0bfe2397382de798d
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] 01/02: Improve message

[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

commit 5f053fa2ec681b80bda35efb9ea805a62526a447
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:20:33 2021 +

Improve message
---
 java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/LocalStrings.properties 
b/java/org/apache/coyote/http2/LocalStrings.properties
index 3bd153f..e600786 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -95,7 +95,7 @@ stream.inputBuffer.empty=The Stream input buffer is empty. 
Waiting for more data
 stream.inputBuffer.readTimeout=Timeout waiting to read data from client
 stream.inputBuffer.reset=Stream reset
 stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting. 
Signalling that thread to continue
-stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previous read into 
input stream buffer
+stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into 
input stream buffer
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
 stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing 
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
 stream.recycle=Connection [{0}], Stream [{1}] has been recycled


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

[tomcat] 02/02: Additional fix for BZ 65179

[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

commit 0197b1e93ba6dc0352d22f23e668a35c0db521f3
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:21:22 2021 +

Additional fix for BZ 65179
---
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2Parser.java 
b/java/org/apache/coyote/http2/Http2Parser.java
index 2da5049..f4298d7 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -196,7 +196,7 @@ class Http2Parser {
 if (endOfStream) {
 output.receivedEndOfStream(streamId);
 }
-output.endRequestBodyFrame(streamId);
+output.endRequestBodyFrame(streamId, dataLength);
 }
 }
 }
@@ -670,7 +670,7 @@ class Http2Parser {
 
 // Data frames
 ByteBuffer startRequestBodyFrame(int streamId, int payloadSize, 
boolean endOfStream) throws Http2Exception;
-void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException;
+void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException;
 void receivedEndOfStream(int streamId) throws ConnectionException;
 /**
  * Notification triggered when the parser swallows some or all of a 
DATA
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index aa72fa0..4c5ab94 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1588,10 +1588,17 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException {
 AbstractNonZeroStream abstractNonZeroStream = 
getAbstractNonZeroStream(streamId, true);
 if (abstractNonZeroStream instanceof Stream) {
 ((Stream) 
abstractNonZeroStream).getInputBuffer().onDataAvailable();
+} else {
+// The Stream was recycled between the call in Http2Parser to
+// startRequestBodyFrame() and the synchronized block that contains
+// 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);
 }
 }
 
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index a848c55..dc41ab3 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1043,7 +1043,7 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception {
 if (bodyBuffer != null) {
 if (bodyBuffer.limit() > 0) {
 trace.append(lastStreamId + "-Body-");


-
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 (628742e -> 0197b1e)

[markt]

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

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


from 628742e  Add debug logging after test failure on Travis CI
 new 5f053fa  Improve message
 new 0197b1e  Additional fix for BZ 65179

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


Summary of changes:
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 java/org/apache/coyote/http2/LocalStrings.properties  | 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)


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

[tomcat] 02/02: Additional fix for BZ 65179

[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

commit 3d3622b8f192d314c1219897f63e04a2bdc023dd
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:21:22 2021 +

Additional fix for BZ 65179
---
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2Parser.java 
b/java/org/apache/coyote/http2/Http2Parser.java
index 65be925..1d0b401 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -208,7 +208,7 @@ class Http2Parser {
 if (endOfStream) {
 output.receivedEndOfStream(streamId);
 }
-output.endRequestBodyFrame(streamId);
+output.endRequestBodyFrame(streamId, dataLength);
 }
 }
 }
@@ -747,7 +747,7 @@ class Http2Parser {
 
 // Data frames
 ByteBuffer startRequestBodyFrame(int streamId, int payloadSize, 
boolean endOfStream) throws Http2Exception;
-void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException;
+void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException;
 void receivedEndOfStream(int streamId) throws ConnectionException;
 /**
  * Notification triggered when the parser swallows some or all of a 
DATA
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index a247795..3c6bc18 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1481,10 +1481,17 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException {
 AbstractNonZeroStream abstractNonZeroStream = 
getAbstractNonZeroStream(streamId, true);
 if (abstractNonZeroStream instanceof Stream) {
 ((Stream) 
abstractNonZeroStream).getInputBuffer().onDataAvailable();
+} else {
+// The Stream was recycled between the call in Http2Parser to
+// startRequestBodyFrame() and the synchronized block that contains
+// 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);
 }
 }
 
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 5a00a91..f25cde3 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1028,7 +1028,7 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception {
 if (bodyBuffer != null) {
 if (bodyBuffer.limit() > 0) {
 trace.append(lastStreamId + "-Body-");


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

[tomcat] 01/02: Improve message

[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

commit 504303893d0f15a45dbb7553789c265841d4b157
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:20:33 2021 +

Improve message
---
 java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/LocalStrings.properties 
b/java/org/apache/coyote/http2/LocalStrings.properties
index 7e7fe63..485b234 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -96,7 +96,7 @@ stream.inputBuffer.empty=The Stream input buffer is empty. 
Waiting for more data
 stream.inputBuffer.readTimeout=Timeout waiting to read data from client
 stream.inputBuffer.reset=Stream reset
 stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting. 
Signalling that thread to continue
-stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previous read into 
input stream buffer
+stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into 
input stream buffer
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
 stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing 
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
 stream.recycle=Connection [{0}], Stream [{1}] has been recycled


-
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 (1520961 -> 3d3622b)

[markt]

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

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


from 1520961  Add debug logging after test failure on Travis CI
 new 5043038  Improve message
 new 3d3622b  Additional fix for BZ 65179

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


Summary of changes:
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 java/org/apache/coyote/http2/LocalStrings.properties  | 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)


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

[tomcat] 02/02: Additional fix for BZ 65179

[markt]

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

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

commit fc30f97326862af3a577b1c0bfe2397382de798d
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:21:22 2021 +

Additional fix for BZ 65179
---
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2Parser.java 
b/java/org/apache/coyote/http2/Http2Parser.java
index bf0565d..0e489e8 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -208,7 +208,7 @@ class Http2Parser {
 if (endOfStream) {
 output.receivedEndOfStream(streamId);
 }
-output.endRequestBodyFrame(streamId);
+output.endRequestBodyFrame(streamId, dataLength);
 }
 }
 }
@@ -747,7 +747,7 @@ class Http2Parser {
 
 // Data frames
 ByteBuffer startRequestBodyFrame(int streamId, int payloadSize, 
boolean endOfStream) throws Http2Exception;
-void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException;
+void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException;
 void receivedEndOfStream(int streamId) throws ConnectionException;
 /**
  * Notification triggered when the parser swallows some or all of a 
DATA
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index dcc6c18..994a7cb 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1481,10 +1481,17 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception, 
IOException {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception, IOException {
 AbstractNonZeroStream abstractNonZeroStream = 
getAbstractNonZeroStream(streamId, true);
 if (abstractNonZeroStream instanceof Stream) {
 ((Stream) 
abstractNonZeroStream).getInputBuffer().onDataAvailable();
+} else {
+// The Stream was recycled between the call in Http2Parser to
+// startRequestBodyFrame() and the synchronized block that contains
+// 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);
 }
 }
 
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java 
b/test/org/apache/coyote/http2/Http2TestBase.java
index 3a92861..7cee15a 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -1031,7 +1031,7 @@ public abstract class Http2TestBase extends 
TomcatBaseTest {
 
 
 @Override
-public void endRequestBodyFrame(int streamId) throws Http2Exception {
+public void endRequestBodyFrame(int streamId, int dataLength) throws 
Http2Exception {
 if (bodyBuffer != null) {
 if (bodyBuffer.limit() > 0) {
 trace.append(lastStreamId + "-Body-");


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

[tomcat] 01/02: Improve message

[markt]

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

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

commit f815a91b1943629539860852638a87034651d493
Author: Mark Thomas 
AuthorDate: Wed Mar 17 11:20:33 2021 +

Improve message
---
 java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/LocalStrings.properties 
b/java/org/apache/coyote/http2/LocalStrings.properties
index 7e7fe63..485b234 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -96,7 +96,7 @@ stream.inputBuffer.empty=The Stream input buffer is empty. 
Waiting for more data
 stream.inputBuffer.readTimeout=Timeout waiting to read data from client
 stream.inputBuffer.reset=Stream reset
 stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting. 
Signalling that thread to continue
-stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previous read into 
input stream buffer
+stream.inputBuffer.swallowUnread=Swallowing [{0}] bytes previously read into 
input stream buffer
 stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
 stream.outputBuffer.flush.debug=Connection [{0}], Stream [{1}], flushing 
output with buffer at position [{2}], writeInProgress [{3}] and closed [{4}]
 stream.recycle=Connection [{0}], Stream [{1}] has been recycled


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

[tomcat] branch master updated (81c88b8 -> fc30f97)

[markt]

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

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


from 81c88b8  Add debug logging after test failure on Travis CI
 new f815a91  Improve message
 new fc30f97  Additional fix for BZ 65179

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


Summary of changes:
 java/org/apache/coyote/http2/Http2Parser.java | 4 ++--
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 9 -
 java/org/apache/coyote/http2/LocalStrings.properties  | 2 +-
 test/org/apache/coyote/http2/Http2TestBase.java   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)


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

buildbot success in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/690

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 1520961b082d6a7c7e9c9e6466ff7fe5031cbf72
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5737

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 81c88b82e1f934e1c4efdd353a800c060a817dcd
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
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: Add debug logging after test failure on Travis CI

[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 628742e  Add debug logging after test failure on Travis CI
628742e is described below

commit 628742ee5dd6e649fdaf17cddba4386ec8a24238
Author: Mark Thomas 
AuthorDate: Wed Mar 17 09:19:03 2021 +

Add debug logging after test failure on Travis CI

Error was:
Exception in thread "http-nio2-127.0.0.1-auto-1-exec-6"
java.nio.BufferOverflowException
at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:213)
at 
org.apache.coyote.http2.Http2Parser.readDataFrame(Http2Parser.java:200)
...

So far, I ahven't been able to identify a code path that could trigger
this so enabling debug logging to gather more info.
---
 .../apache/coyote/http2/TestCancelledUpload.java   | 121 +++--
 1 file changed, 64 insertions(+), 57 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java 
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index accd4b3..a3ad010 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -19,6 +19,8 @@ package org.apache.coyote.http2;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -37,72 +39,77 @@ public class TestCancelledUpload extends Http2TestBase {
 public void testCancelledRequest() throws Exception {
 http2Connect();
 
-http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
+
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
+try {
+http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-int bodySize = 8192;
-int bodyCount = 20;
+int bodySize = 8192;
+int bodyCount = 20;
 
-byte[] headersFrameHeader = new byte[9];
-ByteBuffer headersPayload = ByteBuffer.allocate(128);
-byte[] dataFrameHeader = new byte[9];
-ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
-byte[] trailerFrameHeader = new byte[9];
-ByteBuffer trailerPayload = ByteBuffer.allocate(256);
+byte[] headersFrameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+byte[] dataFrameHeader = new byte[9];
+ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
+byte[] trailerFrameHeader = new byte[9];
+ByteBuffer trailerPayload = ByteBuffer.allocate(256);
 
-buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
-null, trailerFrameHeader, trailerPayload, 3);
+buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
+null, trailerFrameHeader, trailerPayload, 3);
 
-// Write the headers
-writeFrame(headersFrameHeader, headersPayload);
-// Body
-for (int i = 0; i < bodyCount; i++) {
-writeFrame(dataFrameHeader, dataPayload);
-}
+// Write the headers
+writeFrame(headersFrameHeader, headersPayload);
+// Body
+for (int i = 0; i < bodyCount; i++) {
+writeFrame(dataFrameHeader, dataPayload);
+}
 
-// Trailers
-writeFrame(trailerFrameHeader, trailerPayload);
-
-// The Server will process the request on a separate thread to the
-// incoming frames.
-// The request processing thread will:
-// - read up to 128 bytes of request body
-//   (and issue a window update for bytes read)
-// - write a 403 response with no response body
-// The connection processing thread will:
-// - read the request body until the flow control window is exhausted
-// - reset the stream if further DATA frames are received
-parser.readFrame(true);
-
-// Check for reset and exit if found
-if (checkReset()) {
-return;
-}
+// Trailers
+writeFrame(trailerFrameHeader, trailerPayload);
+
+// The Server will process the request on a separate thread to the
+// incoming frames.
+// The request processing thread will:
+// - read up to 128 bytes of request body
+//   (and issue a window update for bytes read)
+// - write a 403 response with no response body
+// The connection processing thread will:
+// - read the request body until the flow control window is 
exhausted
+// - reset 

[tomcat] branch 9.0.x updated: Add debug logging after test failure on Travis CI

[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 1520961  Add debug logging after test failure on Travis CI
1520961 is described below

commit 1520961b082d6a7c7e9c9e6466ff7fe5031cbf72
Author: Mark Thomas 
AuthorDate: Wed Mar 17 09:19:03 2021 +

Add debug logging after test failure on Travis CI

Error was:
Exception in thread "http-nio2-127.0.0.1-auto-1-exec-6"
java.nio.BufferOverflowException
at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:213)
at 
org.apache.coyote.http2.Http2Parser.readDataFrame(Http2Parser.java:200)
...

So far, I ahven't been able to identify a code path that could trigger
this so enabling debug logging to gather more info.
---
 .../apache/coyote/http2/TestCancelledUpload.java   | 121 +++--
 1 file changed, 64 insertions(+), 57 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java 
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index accd4b3..a3ad010 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -19,6 +19,8 @@ package org.apache.coyote.http2;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -37,72 +39,77 @@ public class TestCancelledUpload extends Http2TestBase {
 public void testCancelledRequest() throws Exception {
 http2Connect();
 
-http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
+
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
+try {
+http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-int bodySize = 8192;
-int bodyCount = 20;
+int bodySize = 8192;
+int bodyCount = 20;
 
-byte[] headersFrameHeader = new byte[9];
-ByteBuffer headersPayload = ByteBuffer.allocate(128);
-byte[] dataFrameHeader = new byte[9];
-ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
-byte[] trailerFrameHeader = new byte[9];
-ByteBuffer trailerPayload = ByteBuffer.allocate(256);
+byte[] headersFrameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+byte[] dataFrameHeader = new byte[9];
+ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
+byte[] trailerFrameHeader = new byte[9];
+ByteBuffer trailerPayload = ByteBuffer.allocate(256);
 
-buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
-null, trailerFrameHeader, trailerPayload, 3);
+buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
+null, trailerFrameHeader, trailerPayload, 3);
 
-// Write the headers
-writeFrame(headersFrameHeader, headersPayload);
-// Body
-for (int i = 0; i < bodyCount; i++) {
-writeFrame(dataFrameHeader, dataPayload);
-}
+// Write the headers
+writeFrame(headersFrameHeader, headersPayload);
+// Body
+for (int i = 0; i < bodyCount; i++) {
+writeFrame(dataFrameHeader, dataPayload);
+}
 
-// Trailers
-writeFrame(trailerFrameHeader, trailerPayload);
-
-// The Server will process the request on a separate thread to the
-// incoming frames.
-// The request processing thread will:
-// - read up to 128 bytes of request body
-//   (and issue a window update for bytes read)
-// - write a 403 response with no response body
-// The connection processing thread will:
-// - read the request body until the flow control window is exhausted
-// - reset the stream if further DATA frames are received
-parser.readFrame(true);
-
-// Check for reset and exit if found
-if (checkReset()) {
-return;
-}
+// Trailers
+writeFrame(trailerFrameHeader, trailerPayload);
+
+// The Server will process the request on a separate thread to the
+// incoming frames.
+// The request processing thread will:
+// - read up to 128 bytes of request body
+//   (and issue a window update for bytes read)
+// - write a 403 response with no response body
+// The connection processing thread will:
+// - read the request body until the flow control window is 
exhausted
+// - reset 

[tomcat] branch master updated: Add debug logging after test failure on Travis CI

[markt]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 81c88b8  Add debug logging after test failure on Travis CI
81c88b8 is described below

commit 81c88b82e1f934e1c4efdd353a800c060a817dcd
Author: Mark Thomas 
AuthorDate: Wed Mar 17 09:19:03 2021 +

Add debug logging after test failure on Travis CI

Error was:
Exception in thread "http-nio2-127.0.0.1-auto-1-exec-6"
java.nio.BufferOverflowException
at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:213)
at 
org.apache.coyote.http2.Http2Parser.readDataFrame(Http2Parser.java:200)
...

So far, I ahven't been able to identify a code path that could trigger
this so enabling debug logging to gather more info.
---
 .../apache/coyote/http2/TestCancelledUpload.java   | 121 +++--
 1 file changed, 64 insertions(+), 57 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java 
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 77c31ba..60c943b 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -19,6 +19,8 @@ package org.apache.coyote.http2;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -38,72 +40,77 @@ public class TestCancelledUpload extends Http2TestBase {
 public void testCancelledRequest() throws Exception {
 http2Connect();
 
-((AbstractHttp11Protocol) 
http2Protocol.getHttp11Protocol()).setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
+
LogManager.getLogManager().getLogger("org.apache.coyote.http2").setLevel(Level.ALL);
+try {
+((AbstractHttp11Protocol) 
http2Protocol.getHttp11Protocol()).setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
 
-int bodySize = 8192;
-int bodyCount = 20;
+int bodySize = 8192;
+int bodyCount = 20;
 
-byte[] headersFrameHeader = new byte[9];
-ByteBuffer headersPayload = ByteBuffer.allocate(128);
-byte[] dataFrameHeader = new byte[9];
-ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
-byte[] trailerFrameHeader = new byte[9];
-ByteBuffer trailerPayload = ByteBuffer.allocate(256);
+byte[] headersFrameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+byte[] dataFrameHeader = new byte[9];
+ByteBuffer dataPayload = ByteBuffer.allocate(bodySize);
+byte[] trailerFrameHeader = new byte[9];
+ByteBuffer trailerPayload = ByteBuffer.allocate(256);
 
-buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
-null, trailerFrameHeader, trailerPayload, 3);
+buildPostRequest(headersFrameHeader, headersPayload, false, 
dataFrameHeader, dataPayload,
+null, trailerFrameHeader, trailerPayload, 3);
 
-// Write the headers
-writeFrame(headersFrameHeader, headersPayload);
-// Body
-for (int i = 0; i < bodyCount; i++) {
-writeFrame(dataFrameHeader, dataPayload);
-}
+// Write the headers
+writeFrame(headersFrameHeader, headersPayload);
+// Body
+for (int i = 0; i < bodyCount; i++) {
+writeFrame(dataFrameHeader, dataPayload);
+}
 
-// Trailers
-writeFrame(trailerFrameHeader, trailerPayload);
-
-// The Server will process the request on a separate thread to the
-// incoming frames.
-// The request processing thread will:
-// - read up to 128 bytes of request body
-//   (and issue a window update for bytes read)
-// - write a 403 response with no response body
-// The connection processing thread will:
-// - read the request body until the flow control window is exhausted
-// - reset the stream if further DATA frames are received
-parser.readFrame(true);
-
-// Check for reset and exit if found
-if (checkReset()) {
-return;
-}
+// Trailers
+writeFrame(trailerFrameHeader, trailerPayload);
+
+// The Server will process the request on a separate thread to the
+// incoming frames.
+// The request processing thread will:
+// - read up to 128 bytes of request body
+//   (and issue a window update for bytes read)
+// - write a 403 response with no response body
+// The connection processing thread will:
+