buildbot success in on tomcat-9-trunk
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/386 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] 5cfcbf3045be472adde7b6f1c025f73df0cf6c3b 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 success in on tomcat-trunk
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/5372 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] 51e0739b098f8ce0ad77bcc5cafa9a54fb260804 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-9-trunk
The Buildbot has detected a new failure on builder tomcat-9-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-9-trunk/builds/385 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] ef9219710dc9b9b7bb6df4f56e41c4912b9b628d 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
buildbot failure in on tomcat-trunk
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/5371 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] f06a8ff1b5ca7303538b580d26b64b985ab37aef 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
[CONF] Apache Tomcat > WebSocket 2.0 TCK
Title: Message Title There's 1 new edit on this page WebSocket 2.0 TCK Mark Thomas edited this page Here's the version comment Mark Thomas edited at 08:33 PM Update testing results Here's what changed: ... A default 10.0.x build (as of 2020-0708-1521) running with the local staged TCK build (as of 2020-0708-1521) triggers 1 0 test failure: 1 faulty test ... failures: 5 Tests 'fixed' by appropriate system property configuration (see above). ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[tomcat] branch 8.5.x updated: Need to clear trace once validated
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 522d7ba Need to clear trace once validated
522d7ba is described below
commit 522d7ba5da7a03c25f9ae5b9085b93ec16b70ba9
Author: Mark Thomas
AuthorDate: Fri Aug 21 21:22:13 2020 +0100
Need to clear trace once validated
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 5376372..fa798c1 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -74,7 +74,7 @@ public class TestCancelledUpload extends Http2TestBase {
parser.readFrame(true);
// If reset is first frame received end test here
-if (output.getTrace().startsWith("3-RST-[3]\\n")) {
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
return;
}
@@ -113,6 +113,7 @@ public class TestCancelledUpload extends Http2TestBase {
Assert.assertEquals("3-Body-0\n" +
"3-EndOfStream\n",
output.getTrace());
+output.clearTrace();
// There must be a reset. There may be some WindowSize frames
parser.readFrame(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: Need to clear trace once validated
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 5cfcbf3 Need to clear trace once validated
5cfcbf3 is described below
commit 5cfcbf3045be472adde7b6f1c025f73df0cf6c3b
Author: Mark Thomas
AuthorDate: Fri Aug 21 21:22:13 2020 +0100
Need to clear trace once validated
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 5376372..fa798c1 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -74,7 +74,7 @@ public class TestCancelledUpload extends Http2TestBase {
parser.readFrame(true);
// If reset is first frame received end test here
-if (output.getTrace().startsWith("3-RST-[3]\\n")) {
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
return;
}
@@ -113,6 +113,7 @@ public class TestCancelledUpload extends Http2TestBase {
Assert.assertEquals("3-Body-0\n" +
"3-EndOfStream\n",
output.getTrace());
+output.clearTrace();
// There must be a reset. There may be some WindowSize frames
parser.readFrame(true);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Need to clear trace once validated
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 51e0739 Need to clear trace once validated
51e0739 is described below
commit 51e0739b098f8ce0ad77bcc5cafa9a54fb260804
Author: Mark Thomas
AuthorDate: Fri Aug 21 21:22:13 2020 +0100
Need to clear trace once validated
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 4a3126c..6c80d9c 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -75,7 +75,7 @@ public class TestCancelledUpload extends Http2TestBase {
parser.readFrame(true);
// If reset is first frame received end test here
-if (output.getTrace().startsWith("3-RST-[3]\\n")) {
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
return;
}
@@ -114,6 +114,7 @@ public class TestCancelledUpload extends Http2TestBase {
Assert.assertEquals("3-Body-0\n" +
"3-EndOfStream\n",
output.getTrace());
+output.clearTrace();
// There must be a reset. There may be some WindowSize frames
parser.readFrame(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: Travis finds another place to send a reset :)
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 1f6e6d2 Travis finds another place to send a reset :)
1f6e6d2 is described below
commit 1f6e6d226b20af963d9995133f413da74d1ea052
Author: Mark Thomas
AuthorDate: Fri Aug 21 20:54:16 2020 +0100
Travis finds another place to send a reset :)
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index f9691ca..5376372 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -94,18 +94,26 @@ public class TestCancelledUpload extends Http2TestBase {
return;
}
-// Not window update, not reset, must be the response
-parser.readFrame(true);
+// Not window update, not reset, must be the headers
Assert.assertEquals("3-HeadersStart\n" +
"3-Header-[:status]-[403]\n" +
"3-Header-[content-length]-[0]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n" +
-"3-Body-0\n" +
-"3-EndOfStream\n",
+"3-HeadersEnd\n",
output.getTrace());
output.clearTrace();
+parser.readFrame(true);
+// Check for reset and exit if found
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
+return;
+}
+
+// Not reset, must be request body
+Assert.assertEquals("3-Body-0\n" +
+"3-EndOfStream\n",
+output.getTrace());
+
// There must be a reset. There may be some WindowSize frames
parser.readFrame(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: Travis finds another place to send a reset :)
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 ef92197 Travis finds another place to send a reset :)
ef92197 is described below
commit ef9219710dc9b9b7bb6df4f56e41c4912b9b628d
Author: Mark Thomas
AuthorDate: Fri Aug 21 20:54:16 2020 +0100
Travis finds another place to send a reset :)
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index f9691ca..5376372 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -94,18 +94,26 @@ public class TestCancelledUpload extends Http2TestBase {
return;
}
-// Not window update, not reset, must be the response
-parser.readFrame(true);
+// Not window update, not reset, must be the headers
Assert.assertEquals("3-HeadersStart\n" +
"3-Header-[:status]-[403]\n" +
"3-Header-[content-length]-[0]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n" +
-"3-Body-0\n" +
-"3-EndOfStream\n",
+"3-HeadersEnd\n",
output.getTrace());
output.clearTrace();
+parser.readFrame(true);
+// Check for reset and exit if found
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
+return;
+}
+
+// Not reset, must be request body
+Assert.assertEquals("3-Body-0\n" +
+"3-EndOfStream\n",
+output.getTrace());
+
// There must be a reset. There may be some WindowSize frames
parser.readFrame(true);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Travis finds another place to send a reset :)
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 f06a8ff Travis finds another place to send a reset :)
f06a8ff is described below
commit f06a8ff1b5ca7303538b580d26b64b985ab37aef
Author: Mark Thomas
AuthorDate: Fri Aug 21 20:54:16 2020 +0100
Travis finds another place to send a reset :)
---
test/org/apache/coyote/http2/TestCancelledUpload.java | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index 8db3f3a..4a3126c 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -95,18 +95,26 @@ public class TestCancelledUpload extends Http2TestBase {
return;
}
-// Not window update, not reset, must be the response
-parser.readFrame(true);
+// Not window update, not reset, must be the headers
Assert.assertEquals("3-HeadersStart\n" +
"3-Header-[:status]-[403]\n" +
"3-Header-[content-length]-[0]\n" +
"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
-"3-HeadersEnd\n" +
-"3-Body-0\n" +
-"3-EndOfStream\n",
+"3-HeadersEnd\n",
output.getTrace());
output.clearTrace();
+parser.readFrame(true);
+// Check for reset and exit if found
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
+return;
+}
+
+// Not reset, must be request body
+Assert.assertEquals("3-Body-0\n" +
+"3-EndOfStream\n",
+output.getTrace());
+
// There must be a reset. There may be some WindowSize frames
parser.readFrame(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: Trigger a CI to check Travis build stability
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 5a9e743 Trigger a CI to check Travis build stability
5a9e743 is described below
commit 5a9e7437dbd54ce43adc92e11c6c8bd46245cee2
Author: Mark Thomas
AuthorDate: Fri Aug 21 19:25:38 2020 +0100
Trigger a CI to check Travis build stability
---
test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
index b697dd7..2b2291c 100644
--- a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
+++ b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
@@ -95,7 +95,7 @@ public class TestMimeHeadersIntegration extends
TomcatBaseTest {
Assert.assertEquals("OK", client.getResponseBody());
} else {
alv.validateAccessLog(1, 400, 0, 3000);
-// Connection aborted or response 400
+// Connection cancelled or response 400
Assert.assertTrue("Response line is: " + client.getResponseLine(),
client.getResponseLine() == null ||
client.isResponse400());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Trigger a CI to check Travis build stability
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 d2bcdf5 Trigger a CI to check Travis build stability
d2bcdf5 is described below
commit d2bcdf5ec83c565fb69ef5e222dd4a45ce009858
Author: Mark Thomas
AuthorDate: Fri Aug 21 19:25:38 2020 +0100
Trigger a CI to check Travis build stability
---
test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
index a24255c..03f7009 100644
--- a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
+++ b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
@@ -95,7 +95,7 @@ public class TestMimeHeadersIntegration extends
TomcatBaseTest {
Assert.assertEquals("OK", client.getResponseBody());
} else {
alv.validateAccessLog(1, 400, 0, 3000);
-// Connection aborted or response 400
+// Connection cancelled or response 400
Assert.assertTrue("Response line is: " + client.getResponseLine(),
client.getResponseLine() == null ||
client.isResponse400());
}
-
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: Trigger a CI to check Travis build stability
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 e6ec4ca Trigger a CI to check Travis build stability
e6ec4ca is described below
commit e6ec4cae74073b101d7460ac023d3730ff029486
Author: Mark Thomas
AuthorDate: Fri Aug 21 19:25:38 2020 +0100
Trigger a CI to check Travis build stability
---
test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
index b697dd7..2b2291c 100644
--- a/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
+++ b/test/org/apache/tomcat/util/http/TestMimeHeadersIntegration.java
@@ -95,7 +95,7 @@ public class TestMimeHeadersIntegration extends
TomcatBaseTest {
Assert.assertEquals("OK", client.getResponseBody());
} else {
alv.validateAccessLog(1, 400, 0, 3000);
-// Connection aborted or response 400
+// Connection cancelled or response 400
Assert.assertTrue("Response line is: " + client.getResponseLine(),
client.getResponseLine() == null ||
client.isResponse400());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.25
On 21/08/2020 19:22, Mark Thomas wrote: > Version 1.2.25 includes the following changes compared to 1.2.24 > > - Improvements to LibreSSL support > > - Improvements to HP_UX support > > Various other fixes and improvements. See the changelog for details. > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.25 release is > [X] Stable, go ahead and release > [ ] Broken because of ... I've been running unit tests locally without any issues. Mark > > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.25 > [2] > https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=a94590ec2a5e40b168a9494144125a52f41ed0b2 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 1.2.25
Version 1.2.25 includes the following changes compared to 1.2.24 - Improvements to LibreSSL support - Improvements to HP_UX support Various other fixes and improvements. See the changelog for details. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.25 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.25 [2] https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=a94590ec2a5e40b168a9494144125a52f41ed0b2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r41059 - in /dev/tomcat/tomcat-connectors/native/1.2.25: ./ binaries/ source/
Author: markt Date: Fri Aug 21 18:15:35 2020 New Revision: 41059 Log: Upload Apache Tomcat Connectors 1.2.25 for voting Added: dev/tomcat/tomcat-connectors/native/1.2.25/ dev/tomcat/tomcat-connectors/native/1.2.25/binaries/ dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/1.2.25/source/ dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.asc Fri Aug 21 18:15:35 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAl9ADwIACgkQEMAcWi9g +WecUZBAA0L5pgWiDDnDwnPf5fOQWZUeUl68syopRL3NbTW93mWhdJLPAtMj3/DNL +JOIn7P23CAscwULPHwArsEhgo1y3V9+7eopQmKvlNqyyRJtzqhsVCosOwMEKUmrj +1VLdXgPBSOjRpE/K33QtcGPvO9wU5THkIwXvD/6/nvZqcRhVVNRaelJJzrTEwzZX +590PPF429vNkwTI8/DHjZWD3EwqGbWmj1zxijJP1WVR9IHl2hBKcev3zZWD5eWuN +6D05GhUEWw00esaP5ffNeYBr/mYzJd+sDwcqxWMZaqmQOwVajnG8JGcHGSSCQ+9A +/aV5FJBTs3g2haCjk9VH20mBv+d1cYnWt2uoAKsidWfx90c8B/RGQTnoxeuq/B8V +LYHfmbFhwGxVDBdPaH/z1F9cF4qoChi8n19D+rUCok4AV6SiJAEh2Z1/0/Hg8Ygu +TynFiB2h5BDqTJWlwjrYlTysl2YAoeAbWxD1nSH4UlDz1yc8WiReCojvWjh/w3Db +vavZUJXxfmNgEO/CSw/PXl2l351koEqHGgjGsEW8Zk7Kz/BwXZUC8ATN2NbfNy+E +akJrDaDx7pO4rcEQriANgiW2FQIBsVueqloWX+b/TYVSjnmEfu0YcLXPB1HqyTRT +VnLwf78z/sUOUbm9QFtRcNadftIGILp3LDSq1247yvGAaSGRE0A= +=HRhn +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.sha512 Fri Aug 21 18:15:35 2020 @@ -0,0 +1 @@ +a4bb937134b927811201fc2a310ec1762ec04d81f5615dd136272e35b39de89335ea468116b8344ba20fc8c863920b2b0a665a4f14878a90607dece562422488 *tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip -- s
[tomcat-native] 01/01: Tag 1.2.25
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 1.2.25
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit a94590ec2a5e40b168a9494144125a52f41ed0b2
Author: Mark Thomas
AuthorDate: Fri Aug 21 18:58:06 2020 +0100
Tag 1.2.25
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 70ef79c..45ffb2e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=1
version.minor=2
version.build=25
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index b1cebfd..111a075 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.25 created (now a94590e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.25 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at a94590e (commit) This tag includes the following new commits: new a94590e Tag 1.2.25 The 1 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. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 1.2.25 created (now 303f47f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 1.2.25 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git. at 303f47f (commit) No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated: Estimate 1.2.25 release date as 2020-08-26.
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-native.git The following commit(s) were added to refs/heads/master by this push: new 303f47f Estimate 1.2.25 release date as 2020-08-26. 303f47f is described below commit 303f47f554bfad5583c90dc3007e9f967cbe0af0 Author: Mark Thomas AuthorDate: Fri Aug 21 18:52:54 2020 +0100 Estimate 1.2.25 release date as 2020-08-26. --- xdocs/index.xml | 4 ++-- xdocs/news/2020.xml | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xdocs/index.xml b/xdocs/index.xml index 24b7a71..3bfb3db 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -59,10 +59,10 @@ -29 Apr 2020 - TC-Native-1.2.24 +26 Aug 2020 - TC-Native-1.2.25 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.24 Stable. +Tomcat Native 1.2.25 Stable. The sources and the binaries for selected platforms are available from the Download page. diff --git a/xdocs/news/2020.xml b/xdocs/news/2020.xml index 74ac3b0..36f6ec5 100644 --- a/xdocs/news/2020.xml +++ b/xdocs/news/2020.xml @@ -29,6 +29,11 @@ + + The Apache Tomcat team is proud to announce the immediate availability of + Tomcat Native 1.2.25. This is a bugfix release. + + The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.2.24. This is a bugfix release. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch master updated: Update Java JNI code
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-native.git
The following commit(s) were added to refs/heads/master by this push:
new a086e72 Update Java JNI code
a086e72 is described below
commit a086e7271fb1743de61ab3925cb25ecc6e098830
Author: Mark Thomas
AuthorDate: Fri Aug 21 18:44:47 2020 +0100
Update Java JNI code
---
java/org/apache/tomcat/jni/Library.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/jni/Library.java
b/java/org/apache/tomcat/jni/Library.java
index 9034e23..c6c1398 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -64,9 +64,9 @@ public final class Library {
if (!loaded) {
String path = System.getProperty("java.library.path");
String [] paths = path.split(File.pathSeparator);
-for (int i = 0; i < NAMES.length; i++) {
+for (String value : NAMES) {
try {
-System.loadLibrary(NAMES[i]);
+System.loadLibrary(value);
loaded = true;
} catch (ThreadDeath t) {
throw t;
@@ -75,9 +75,9 @@ public final class Library {
// the JNI code identical between Tomcat 6/7/8/9
throw t;
} catch (Throwable t) {
-String name = System.mapLibraryName(NAMES[i]);
-for (int j = 0; j < paths.length; j++) {
-java.io.File fd = new java.io.File(paths[j] , name);
+String name = System.mapLibraryName(value);
+for (String s : paths) {
+File fd = new File(s, name);
if (fd.exists()) {
// File exists but failed to load
throw t;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Improve validation of expected response
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 cc9e398c9f3fdb5dd5ae82f6973de923bd0bb067
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:33:38 2020 +0100
Improve validation of expected response
---
.../apache/coyote/http2/TestCancelledUpload.java | 67 +-
1 file changed, 52 insertions(+), 15 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index a89dc55..f9691ca 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -62,29 +62,66 @@ public class TestCancelledUpload extends Http2TestBase {
// Trailers
writeFrame(trailerFrameHeader, trailerPayload);
-// The actual response depends on timing issues. Particularly how much
-// data is transferred in StreamInputBuffer inBuffer to outBuffer on
the
-// first read.
-while (output.getTrace().length() == 0) {
-try {
-parser.readFrame(true);
-if ("3-RST-[3]\n".equals(output.getTrace())) {
-output.clearTrace();
-}
-} catch (IOException ioe) {
-// Might not be any further frames after the reset
-break;
-}
+// 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);
+
+// If reset is first frame received end test here
+if (output.getTrace().startsWith("3-RST-[3]\\n")) {
+return;
+}
+
+// Validate any WindowSize frames (always arrive in pairs)
+while (output.getTrace().startsWith("0-WindowSize-[")) {
+String trace = output.getTrace();
+int size = Integer.parseInt(trace.substring(14, trace.length() -
2));
+output.clearTrace();
+parser.readFrame(true);
+Assert.assertEquals("3-WindowSize-[" + size + "]\n",
output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
}
-if (output.getTrace().startsWith("0-WindowSize-[")) {
+// Check for reset and exit if found
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
+return;
+}
+
+// Not window update, not reset, must be the response
+parser.readFrame(true);
+Assert.assertEquals("3-HeadersStart\n" +
+"3-Header-[:status]-[403]\n" +
+"3-Header-[content-length]-[0]\n" +
+"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+"3-HeadersEnd\n" +
+"3-Body-0\n" +
+"3-EndOfStream\n",
+output.getTrace());
+output.clearTrace();
+
+// There must be a reset. There may be some WindowSize frames
+parser.readFrame(true);
+
+// Validate any WindowSize frames (always arrive in pairs)
+while (output.getTrace().startsWith("0-WindowSize-[")) {
String trace = output.getTrace();
int size = Integer.parseInt(trace.substring(14, trace.length() -
2));
output.clearTrace();
-// Window updates always come in pairs
parser.readFrame(true);
Assert.assertEquals("3-WindowSize-[" + size + "]\n",
output.getTrace());
}
+
+// This should be the reset
+Assert.assertEquals("3-RST-[3]\n", output.getTrace());
+
+// If there are any more frames after this, ignore them
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Avoid possible NPE when stream is closed
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 198d63b2ad2ce564c06fb597304d85ab9e350a8c
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:34:10 2020 +0100
Avoid possible NPE when stream is closed
---
java/org/apache/coyote/http2/Stream.java | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 2530982..1b750ef 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -594,10 +594,10 @@ public class Stream extends AbstractStream implements
HeaderEmitter {
final void receivedEndOfStream() throws ConnectionException {
-long contentLengthHeader = coyoteRequest.getContentLengthLong();
-if (contentLengthHeader > -1 && contentLengthReceived !=
contentLengthHeader) {
+if (isContentLengthInconsistent()) {
throw new
ConnectionException(sm.getString("stream.header.contentLength",
-getConnectionId(), getIdentifier(),
Long.valueOf(contentLengthHeader),
+getConnectionId(), getIdentifier(),
+Long.valueOf(coyoteRequest.getContentLengthLong()),
Long.valueOf(contentLengthReceived)),
Http2Error.PROTOCOL_ERROR);
}
state.receivedEndOfStream();
@@ -607,6 +607,20 @@ public class Stream extends AbstractStream implements
HeaderEmitter {
}
+final boolean isContentLengthInconsistent() {
+Request coyoteRequest = this.coyoteRequest;
+// May be null when processing trailer headers after stream has been
+// closed.
+if (coyoteRequest != null) {
+long contentLengthHeader = coyoteRequest.getContentLengthLong();
+if (contentLengthHeader > -1 && contentLengthReceived !=
contentLengthHeader) {
+return true;
+}
+}
+return false;
+}
+
+
final void sentHeaders() {
state.sentStartOfHeaders();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Alter approach in an attempt to reduce CI failures
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 603e9a840ef3ecb4f72a6583d9e986d48f77d871
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:51:35 2020 +0100
Alter approach in an attempt to reduce CI failures
---
.../catalina/nonblocking/TestNonBlockingAPI.java | 24 ++
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index b1ef421..c964224 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -322,7 +322,10 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
TesterAccessLogValve alv = new TesterAccessLogValve();
ctx.getPipeline().addValve(alv);
-NBWriteServlet servlet = new NBWriteServlet();
+// Some CI platforms appear to have particularly large write buffers
+// and appear to ignore the socket.txBufSize below. Therefore,
configure
+// configure the Servlet to keep writing until an error is encountered.
+NBWriteServlet servlet = new NBWriteServlet(true);
String servletName = NBWriteServlet.class.getName();
Tomcat.addServlet(ctx, servletName, servlet);
ctx.addServletMappingDecoded("/", servletName);
@@ -541,9 +544,20 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
@WebServlet(asyncSupported = true)
public static class NBWriteServlet extends TesterServlet {
private static final long serialVersionUID = 1L;
+private final boolean unlimited;
public transient volatile TestWriteListener wlistener;
public transient volatile TestReadListener rlistener;
+public NBWriteServlet() {
+this(false);
+}
+
+
+public NBWriteServlet(boolean unlimited) {
+this.unlimited = unlimited;
+}
+
+
@Override
protected void service(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
// step 1 - start async
@@ -577,7 +591,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
in.setReadListener(rlistener);
ServletOutputStream out = resp.getOutputStream();
resp.setBufferSize(200 * 1024);
-wlistener = new TestWriteListener(actx);
+wlistener = new TestWriteListener(actx, unlimited);
out.setWriteListener(wlistener);
}
@@ -729,18 +743,20 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
private static class TestWriteListener implements WriteListener {
AsyncContext ctx;
+private final boolean unlimited;
int written = 0;
public volatile boolean onErrorInvoked = false;
-public TestWriteListener(AsyncContext ctx) {
+public TestWriteListener(AsyncContext ctx, boolean unlimted) {
this.ctx = ctx;
+this.unlimited = unlimted;
}
@Override
public void onWritePossible() throws IOException {
long start = System.currentTimeMillis();
int before = written;
-while (written < WRITE_SIZE &&
+while ((written < WRITE_SIZE || unlimited) &&
ctx.getResponse().getOutputStream().isReady()) {
ctx.getResponse().getOutputStream().write(
DATA, written, CHUNK_SIZE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Add debug log message for stream recycling
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 abe4d0346247b79c9c5c16d4647754821599729f
Author: Mark Thomas
AuthorDate: Fri Aug 21 14:48:39 2020 +0100
Add debug log message for stream recycling
---
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
java/org/apache/coyote/http2/Stream.java | 3 +++
2 files changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 596b126..3707435 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -94,6 +94,7 @@ stream.inputBuffer.reset=Stream reset
stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting.
Signalling that thread to continue
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
stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}],
Parent [{3}], Weight [{4}]
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 3a52074..2530982 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -704,6 +704,9 @@ public class Stream extends AbstractStream implements
HeaderEmitter {
* Stream instances are retained for a period after the Stream closes.
*/
final void recycle() {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("stream.recycle", getConnectionId(),
getIdentifier()));
+}
coyoteRequest = null;
cookieHeader = null;
coyoteResponse = 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 (389a9bb -> 603e9a8)
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 389a9bb Enable session cache so session ID is available with APR
new 8dc8f39 Improve naming
new abe4d03 Add debug log message for stream recycling
new cc9e398 Improve validation of expected response
new 198d63b Avoid possible NPE when stream is closed
new 5bbb88e Recycle the stream when it is fully closed rather than half
closed
new 603e9a8 Alter approach in an attempt to reduce CI failures
The 6 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:
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 23 ++-
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 24 +--
...AbortedUpload.java => TestCancelledUpload.java} | 77 --
5 files changed, 102 insertions(+), 29 deletions(-)
rename test/org/apache/coyote/http2/{TestAbortedUpload.java =>
TestCancelledUpload.java} (58%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Recycle the stream when it is fully closed rather than half closed
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 5bbb88e564a7ec30fcafebee97d59d2e774ab488
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:35:36 2020 +0100
Recycle the stream when it is fully closed rather than half closed
---
java/org/apache/coyote/http2/StreamProcessor.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 5a24f44..a6f677a 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -87,8 +87,10 @@ class StreamProcessor extends AbstractProcessor {
}
stream.close(se);
} else {
-// stream.close() will call recycle so only need
it here
-stream.recycle();
+if (!stream.isActive()) {
+// stream.close() will call recycle so only
need it here
+stream.recycle();
+}
}
}
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Improve naming
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 8dc8f393ca9d421420af9fbeca21bb47119bc094
Author: Mark Thomas
AuthorDate: Fri Aug 21 12:22:35 2020 +0100
Improve naming
---
.../http2/{TestAbortedUpload.java => TestCancelledUpload.java} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestAbortedUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
similarity index 93%
rename from test/org/apache/coyote/http2/TestAbortedUpload.java
rename to test/org/apache/coyote/http2/TestCancelledUpload.java
index 69e093b..a89dc55 100644
--- a/test/org/apache/coyote/http2/TestAbortedUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -31,10 +31,10 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.startup.Tomcat;
-public class TestAbortedUpload extends Http2TestBase {
+public class TestCancelledUpload extends Http2TestBase {
@Test
-public void testAbortedRequest() throws Exception {
+public void testCancelledRequest() throws Exception {
http2Connect();
http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
@@ -94,14 +94,14 @@ public class TestAbortedUpload extends Http2TestBase {
// Retain '/simple' url-pattern since it enables code re-use
Context ctxt = tomcat.addContext("", null);
-Tomcat.addServlet(ctxt, "abort", new AbortServlet());
-ctxt.addServletMappingDecoded("/simple", "abort");
+Tomcat.addServlet(ctxt, "cancel", new CancelServlet());
+ctxt.addServletMappingDecoded("/simple", "cancel");
tomcat.start();
}
-private static class AbortServlet extends SimpleServlet {
+private static class CancelServlet extends SimpleServlet {
private static final long serialVersionUID = 1L;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Add debug log message for stream recycling
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 f17eb521063849098d30d1466e3bace097a9685d
Author: Mark Thomas
AuthorDate: Fri Aug 21 14:48:39 2020 +0100
Add debug log message for stream recycling
---
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
java/org/apache/coyote/http2/Stream.java | 3 +++
2 files changed, 4 insertions(+)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 4ba59c1..e80e6d3 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -96,6 +96,7 @@ stream.inputBuffer.reset=Stream reset
stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting.
Signalling that thread to continue
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
stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}],
Parent [{3}], Weight [{4}]
stream.reset.fail=Connection [{0}], Stream [{1}], Failed to reset stream
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 208ea1b..70b5e47 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -752,6 +752,9 @@ class Stream extends AbstractStream implements
HeaderEmitter {
* Stream instances are retained for a period after the Stream closes.
*/
final void recycle() {
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("stream.recycle", getConnectionId(),
getIdentifier()));
+}
coyoteRequest = null;
cookieHeader = null;
coyoteResponse = 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 (213b5db -> ff135f4)
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 213b5db Enable session cache so session ID is available with APR
new f2a244c Improve naming
new f17eb52 Add debug log message for stream recycling
new 4787081 Improve validation of expected response
new e1c4e17 Avoid possible NPE when stream is closed
new cdeb8ee Recycle the stream when it is fully closed rather than half
closed
new ff135f4 Alter approach in an attempt to reduce CI failures
The 6 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:
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 14 +++-
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 24 +--
...AbortedUpload.java => TestCancelledUpload.java} | 77 --
5 files changed, 93 insertions(+), 29 deletions(-)
rename test/org/apache/coyote/http2/{TestAbortedUpload.java =>
TestCancelledUpload.java} (58%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Alter approach in an attempt to reduce CI failures
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 ff135f4f94dfab61c3a22345f8d52ab798d3940d
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:51:35 2020 +0100
Alter approach in an attempt to reduce CI failures
---
.../catalina/nonblocking/TestNonBlockingAPI.java | 24 ++
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index e982d57..4bd68c2 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -322,7 +322,10 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
TesterAccessLogValve alv = new TesterAccessLogValve();
ctx.getPipeline().addValve(alv);
-NBWriteServlet servlet = new NBWriteServlet();
+// Some CI platforms appear to have particularly large write buffers
+// and appear to ignore the socket.txBufSize below. Therefore,
configure
+// configure the Servlet to keep writing until an error is encountered.
+NBWriteServlet servlet = new NBWriteServlet(true);
String servletName = NBWriteServlet.class.getName();
Tomcat.addServlet(ctx, servletName, servlet);
ctx.addServletMappingDecoded("/", servletName);
@@ -541,9 +544,20 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
@WebServlet(asyncSupported = true)
public static class NBWriteServlet extends TesterServlet {
private static final long serialVersionUID = 1L;
+private final boolean unlimited;
public transient volatile TestWriteListener wlistener;
public transient volatile TestReadListener rlistener;
+public NBWriteServlet() {
+this(false);
+}
+
+
+public NBWriteServlet(boolean unlimited) {
+this.unlimited = unlimited;
+}
+
+
@Override
protected void service(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
// step 1 - start async
@@ -577,7 +591,7 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
in.setReadListener(rlistener);
ServletOutputStream out = resp.getOutputStream();
resp.setBufferSize(200 * 1024);
-wlistener = new TestWriteListener(actx);
+wlistener = new TestWriteListener(actx, unlimited);
out.setWriteListener(wlistener);
}
@@ -729,18 +743,20 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
private static class TestWriteListener implements WriteListener {
AsyncContext ctx;
+private final boolean unlimited;
int written = 0;
public volatile boolean onErrorInvoked = false;
-public TestWriteListener(AsyncContext ctx) {
+public TestWriteListener(AsyncContext ctx, boolean unlimted) {
this.ctx = ctx;
+this.unlimited = unlimted;
}
@Override
public void onWritePossible() throws IOException {
long start = System.currentTimeMillis();
int before = written;
-while (written < WRITE_SIZE &&
+while ((written < WRITE_SIZE || unlimited) &&
ctx.getResponse().getOutputStream().isReady()) {
ctx.getResponse().getOutputStream().write(
DATA, written, CHUNK_SIZE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Recycle the stream when it is fully closed rather than half closed
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 cdeb8ee099eb787063e310b94942b843710aefff
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:35:36 2020 +0100
Recycle the stream when it is fully closed rather than half closed
---
java/org/apache/coyote/http2/StreamProcessor.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 2b41753..2e40f9c 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -90,8 +90,10 @@ class StreamProcessor extends AbstractProcessor {
}
stream.close(se);
} else {
-// stream.close() will call recycle so only need
it here
-stream.recycle();
+if (!stream.isActive()) {
+// stream.close() will call recycle so only
need it here
+stream.recycle();
+}
}
}
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Improve validation of expected response
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 4787081381733ca731fc4b4b83ca52198ba9b600
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:33:38 2020 +0100
Improve validation of expected response
---
.../apache/coyote/http2/TestCancelledUpload.java | 67 +-
1 file changed, 52 insertions(+), 15 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestCancelledUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
index a89dc55..f9691ca 100644
--- a/test/org/apache/coyote/http2/TestCancelledUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -62,29 +62,66 @@ public class TestCancelledUpload extends Http2TestBase {
// Trailers
writeFrame(trailerFrameHeader, trailerPayload);
-// The actual response depends on timing issues. Particularly how much
-// data is transferred in StreamInputBuffer inBuffer to outBuffer on
the
-// first read.
-while (output.getTrace().length() == 0) {
-try {
-parser.readFrame(true);
-if ("3-RST-[3]\n".equals(output.getTrace())) {
-output.clearTrace();
-}
-} catch (IOException ioe) {
-// Might not be any further frames after the reset
-break;
-}
+// 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);
+
+// If reset is first frame received end test here
+if (output.getTrace().startsWith("3-RST-[3]\\n")) {
+return;
+}
+
+// Validate any WindowSize frames (always arrive in pairs)
+while (output.getTrace().startsWith("0-WindowSize-[")) {
+String trace = output.getTrace();
+int size = Integer.parseInt(trace.substring(14, trace.length() -
2));
+output.clearTrace();
+parser.readFrame(true);
+Assert.assertEquals("3-WindowSize-[" + size + "]\n",
output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
}
-if (output.getTrace().startsWith("0-WindowSize-[")) {
+// Check for reset and exit if found
+if (output.getTrace().startsWith("3-RST-[3]\n")) {
+return;
+}
+
+// Not window update, not reset, must be the response
+parser.readFrame(true);
+Assert.assertEquals("3-HeadersStart\n" +
+"3-Header-[:status]-[403]\n" +
+"3-Header-[content-length]-[0]\n" +
+"3-Header-[date]-[Wed, 11 Nov 2015 19:18:42 GMT]\n" +
+"3-HeadersEnd\n" +
+"3-Body-0\n" +
+"3-EndOfStream\n",
+output.getTrace());
+output.clearTrace();
+
+// There must be a reset. There may be some WindowSize frames
+parser.readFrame(true);
+
+// Validate any WindowSize frames (always arrive in pairs)
+while (output.getTrace().startsWith("0-WindowSize-[")) {
String trace = output.getTrace();
int size = Integer.parseInt(trace.substring(14, trace.length() -
2));
output.clearTrace();
-// Window updates always come in pairs
parser.readFrame(true);
Assert.assertEquals("3-WindowSize-[" + size + "]\n",
output.getTrace());
}
+
+// This should be the reset
+Assert.assertEquals("3-RST-[3]\n", output.getTrace());
+
+// If there are any more frames after this, ignore them
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Avoid possible NPE when stream is closed
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 e1c4e17e1e8aac422ec27d71cf57b1a2f5f58404
Author: Mark Thomas
AuthorDate: Fri Aug 21 16:34:10 2020 +0100
Avoid possible NPE when stream is closed
---
java/org/apache/coyote/http2/Stream.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 70b5e47..30fa819 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -651,9 +651,14 @@ class Stream extends AbstractStream implements
HeaderEmitter {
final boolean isContentLengthInconsistent() {
-long contentLengthHeader = coyoteRequest.getContentLengthLong();
-if (contentLengthHeader > -1 && contentLengthReceived !=
contentLengthHeader) {
-return true;
+Request coyoteRequest = this.coyoteRequest;
+// May be null when processing trailer headers after stream has been
+// closed.
+if (coyoteRequest != null) {
+long contentLengthHeader = coyoteRequest.getContentLengthLong();
+if (contentLengthHeader > -1 && contentLengthReceived !=
contentLengthHeader) {
+return true;
+}
}
return false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: Improve naming
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 f2a244c45bf415b59e42b398af42fd14a11bc2df
Author: Mark Thomas
AuthorDate: Fri Aug 21 12:22:35 2020 +0100
Improve naming
---
.../http2/{TestAbortedUpload.java => TestCancelledUpload.java} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/coyote/http2/TestAbortedUpload.java
b/test/org/apache/coyote/http2/TestCancelledUpload.java
similarity index 93%
rename from test/org/apache/coyote/http2/TestAbortedUpload.java
rename to test/org/apache/coyote/http2/TestCancelledUpload.java
index 69e093b..a89dc55 100644
--- a/test/org/apache/coyote/http2/TestAbortedUpload.java
+++ b/test/org/apache/coyote/http2/TestCancelledUpload.java
@@ -31,10 +31,10 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.startup.Tomcat;
-public class TestAbortedUpload extends Http2TestBase {
+public class TestCancelledUpload extends Http2TestBase {
@Test
-public void testAbortedRequest() throws Exception {
+public void testCancelledRequest() throws Exception {
http2Connect();
http2Protocol.setAllowedTrailerHeaders(TRAILER_HEADER_NAME);
@@ -94,14 +94,14 @@ public class TestAbortedUpload extends Http2TestBase {
// Retain '/simple' url-pattern since it enables code re-use
Context ctxt = tomcat.addContext("", null);
-Tomcat.addServlet(ctxt, "abort", new AbortServlet());
-ctxt.addServletMappingDecoded("/simple", "abort");
+Tomcat.addServlet(ctxt, "cancel", new CancelServlet());
+ctxt.addServletMappingDecoded("/simple", "cancel");
tomcat.start();
}
-private static class AbortServlet extends SimpleServlet {
+private static class CancelServlet extends SimpleServlet {
private static final long serialVersionUID = 1L;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (af4a6a8 -> 1910fde)
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 af4a6a8 Enable session cache so session ID is available with APR
add 485cfb7 Improve naming
add 31e4d5e Add debug log message for stream recycling
add 8fa9e28 Improve validation of expected response
add cb99579 Avoid possible NPE when stream is closed
add 648fc1a Recycle the stream when it is fully closed rather than half
closed
add 1910fde Alter approach in an attempt to reduce CI failures
No new revisions were added by this update.
Summary of changes:
.../apache/coyote/http2/LocalStrings.properties| 1 +
java/org/apache/coyote/http2/Stream.java | 14 +++-
java/org/apache/coyote/http2/StreamProcessor.java | 6 +-
.../catalina/nonblocking/TestNonBlockingAPI.java | 24 +--
...AbortedUpload.java => TestCancelledUpload.java} | 77 --
5 files changed, 93 insertions(+), 29 deletions(-)
rename test/org/apache/coyote/http2/{TestAbortedUpload.java =>
TestCancelledUpload.java} (59%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rpluem commented on pull request #342: Display the CATALINA_OPTS when starting Tomcat
rpluem commented on pull request #342: URL: https://github.com/apache/tomcat/pull/342#issuecomment-678269882 The difference is that for the `VersionLoggerListener` I need to look in the logfile. The change here shows me that information when I startup Tomcat. It's a very quick verifier. Just like it let's me know what `JAVA_HOME` / `JRE_HOME` is used. I can also look up this information with much more details in the logs, but it is an extra step. 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] markt-asf commented on pull request #342: Display the CATALINA_OPTS when starting Tomcat
markt-asf commented on pull request #342: URL: https://github.com/apache/tomcat/pull/342#issuecomment-678219905 What is the benefit of this? The `VersionLoggerListener` already logs individual command line arguments by default. The advantages of this over logging `CATALINA_OPTS` are: - it shows all the command line arguments regardless of how they are set (`JAVA_OPTS`, `CATALINA_OPTS`, script modification etc) - it allows users to confirm that environment variables such as `CATALINA_OPTS` have been parsed as intended. Incorrect quoting and escaping is a common cause of `CATALINA_OPTS` related issues. 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] rpluem opened a new pull request #342: Display the CATALINA_OPTS when starting Tomcat
rpluem opened a new pull request #342: URL: https://github.com/apache/tomcat/pull/342 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
