[tomcat] branch master updated: Attempt to improve test 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 a0ae809 Attempt to improve test stability a0ae809 is described below commit a0ae809557a9b9d8f1a466fc9264cc8af20ff2d1 Author: Mark Thomas AuthorDate: Fri Oct 9 08:18:49 2020 +0100 Attempt to improve test stability Test runs are being stopped by signal (-9). Suspect the OS OOM protection. Reduce the number of parallel test threads from 16 to 4. There are only 2 cores per test VM so a high number of threads is unlikely to provide any benefit. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b049844..af37442 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ install: - cd $CURR_PWD - yes | cp build.properties.default build.properties - echo >> build.properties -- echo "test.threads=16" >> build.properties +- echo "test.threads=4" >> build.properties - echo "test.relaxTiming=true" >> build.properties - echo "test.excludePerformance=true" >> build.properties - echo "test.openssl.path=/dev/null/openssl" >> build.properties - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix a typo in changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov 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 25b Fix a typo in changelog 25b is described below commit 25b55a4adb5f792dacc1a7418d7112f6f4e8 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ec41058..d50d331 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -61,7 +61,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix a typo in changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov 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 2cc9522 Fix a typo in changelog 2cc9522 is described below commit 2cc95227675345097a803f60682592a851d0c2d5 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog (cherry picked from commit 25b55a4adb5f792dacc1a7418d7112f6f4e8) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 07bdea9..64d42d9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -61,7 +61,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix a typo in changelog
This is an automated email from the ASF dual-hosted git repository. mgrigorov 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 c31df67 Fix a typo in changelog c31df67 is described below commit c31df679a20339e4737db8774064ce1b9e065579 Author: Martin Tzvetanov Grigorov AuthorDate: Fri Oct 9 10:21:49 2020 +0300 Fix a typo in changelog (cherry picked from commit 25b55a4adb5f792dacc1a7418d7112f6f4e8) --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3012e9a..f32c1a7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -64,7 +64,7 @@ Refactor the HTTP/2 window update handling for padding in data frames to ensure that the connection window is correctly updated after a data -frame with zero lngth padding is received. (markt) +frame with zero length padding is received. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Fix a typo in changelog
On 09/10/2020 08:22, mgrigo...@apache.org wrote: > This is an automated email from the ASF dual-hosted git repository. > > mgrigorov 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 25b Fix a typo in changelog > 25b is described below > > commit 25b55a4adb5f792dacc1a7418d7112f6f4e8 > Author: Martin Tzvetanov Grigorov > AuthorDate: Fri Oct 9 10:21:49 2020 +0300 > > Fix a typo in changelog Tx. Mark > --- > webapps/docs/changelog.xml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml > index ec41058..d50d331 100644 > --- a/webapps/docs/changelog.xml > +++ b/webapps/docs/changelog.xml > @@ -61,7 +61,7 @@ > > Refactor the HTTP/2 window update handling for padding in data > frames to > ensure that the connection window is correctly updated after a data > -frame with zero lngth padding is received. (markt) > +frame with zero length padding is received. (markt) > > > > > > - > 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
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/489 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] 2cc95227675345097a803f60682592a851d0c2d5 Blamelist: Martin Tzvetanov Grigorov 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 master updated: Increase threads to 8 as s390x and arm64 are running out of time
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 dda893d Increase threads to 8 as s390x and arm64 are running out of time dda893d is described below commit dda893da40f7f4938e74d130ff1915d714fb7f54 Author: Mark Thomas AuthorDate: Fri Oct 9 10:00:19 2020 +0100 Increase threads to 8 as s390x and arm64 are running out of time With a VM having only 2 cores I'd expect 4 threads to be sufficient but the reduction from 16 to 4 did trigger longer runs and failures so try 8. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af37442..d72513a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ install: - cd $CURR_PWD - yes | cp build.properties.default build.properties - echo >> build.properties -- echo "test.threads=4" >> build.properties +- echo "test.threads=8" >> build.properties - echo "test.relaxTiming=true" >> build.properties - echo "test.excludePerformance=true" >> build.properties - echo "test.openssl.path=/dev/null/openssl" >> build.properties - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix URI parsing with encodedSolidusHandling="passthrough"
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 791ef21 Fix URI parsing with encodedSolidusHandling="passthrough" 791ef21 is described below commit 791ef2126b40042bd4c52b4938842d1472c5fc61 Author: Mark Thomas AuthorDate: Fri Oct 9 11:46:03 2020 +0100 Fix URI parsing with encodedSolidusHandling="passthrough" Based on a pull request by willmeck. --- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- test/org/apache/tomcat/util/buf/TestUDecoder.java | 147 ++ webapps/docs/changelog.xml| 6 + 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index d917ca0..7648a7e 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -146,7 +146,9 @@ public final class UDecoder { throw EXCEPTION_SLASH; } case PASS_THROUGH: { -idx += 2; +buff[idx++] = buff[j-2]; +buff[idx++] = buff[j-1]; +buff[idx] = buff[j]; } } } else { diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java b/test/org/apache/tomcat/util/buf/TestUDecoder.java index ca7dd23..f3957b9 100644 --- a/test/org/apache/tomcat/util/buf/TestUDecoder.java +++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.buf; +import java.io.CharConversionException; +import java.io.IOException; import java.nio.charset.StandardCharsets; import org.junit.Assert; @@ -99,4 +101,149 @@ public class TestUDecoder { String result = UDecoder.URLDecode("\u00ea%c3%aa", StandardCharsets.UTF_8); Assert.assertEquals("\u00ea\u00ea", result); } + + +@Test +public void testURLDecodeStringSolidus01() throws IOException { +doTestSolidus("xx", "xx"); +} + + +@Test +public void testURLDecodeStringSolidus02() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test +public void testURLDecodeStringSolidus03() throws IOException { +doTestSolidus("xx%20xx", "xx xx"); +} + + +@Test +public void testURLDecodeStringSolidus04() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus05a() throws IOException { +doTestSolidus("%2f", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus05b() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2f", result); +} + + +@Test +public void testURLDecodeStringSolidus05c() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus06a() throws IOException { +doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus06b() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2fxx xx", result); +} + + +@Test +public void testURLDecodeStringSolidus06c() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/xx xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus07a() throws IOException { +doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus07b() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("xx%2f xx", result); +} + + +@Test +public void testURLDecodeStringSolidus07c() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("xx/ xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus08a() throws IOException { +doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus08b() throws IOException { +String result = doTestSolidus("xx%20%2fxx", Enco
[tomcat] branch 9.0.x updated: Fix URI parsing with encodedSolidusHandling="passthrough"
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 597290a Fix URI parsing with encodedSolidusHandling="passthrough" 597290a is described below commit 597290af4d55d3b01079a3845c081e6590265082 Author: Mark Thomas AuthorDate: Fri Oct 9 11:46:03 2020 +0100 Fix URI parsing with encodedSolidusHandling="passthrough" Based on a pull request by willmeck. --- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- test/org/apache/tomcat/util/buf/TestUDecoder.java | 147 ++ webapps/docs/changelog.xml| 6 + 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index f560221..c821090 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -150,7 +150,9 @@ public final class UDecoder { throw EXCEPTION_SLASH; } case PASS_THROUGH: { -idx += 2; +buff[idx++] = buff[j-2]; +buff[idx++] = buff[j-1]; +buff[idx] = buff[j]; } } } else { diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java b/test/org/apache/tomcat/util/buf/TestUDecoder.java index ca7dd23..f3957b9 100644 --- a/test/org/apache/tomcat/util/buf/TestUDecoder.java +++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.buf; +import java.io.CharConversionException; +import java.io.IOException; import java.nio.charset.StandardCharsets; import org.junit.Assert; @@ -99,4 +101,149 @@ public class TestUDecoder { String result = UDecoder.URLDecode("\u00ea%c3%aa", StandardCharsets.UTF_8); Assert.assertEquals("\u00ea\u00ea", result); } + + +@Test +public void testURLDecodeStringSolidus01() throws IOException { +doTestSolidus("xx", "xx"); +} + + +@Test +public void testURLDecodeStringSolidus02() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test +public void testURLDecodeStringSolidus03() throws IOException { +doTestSolidus("xx%20xx", "xx xx"); +} + + +@Test +public void testURLDecodeStringSolidus04() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus05a() throws IOException { +doTestSolidus("%2f", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus05b() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2f", result); +} + + +@Test +public void testURLDecodeStringSolidus05c() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus06a() throws IOException { +doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus06b() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2fxx xx", result); +} + + +@Test +public void testURLDecodeStringSolidus06c() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/xx xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus07a() throws IOException { +doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus07b() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("xx%2f xx", result); +} + + +@Test +public void testURLDecodeStringSolidus07c() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("xx/ xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus08a() throws IOException { +doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus08b() throws IOException { +String result = doTestSolidus("xx%20%2fxx", Encode
[tomcat] branch 8.5.x updated: Fix URI parsing with encodedSolidusHandling="passthrough"
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 25bd7b3 Fix URI parsing with encodedSolidusHandling="passthrough" 25bd7b3 is described below commit 25bd7b3e5ef069c26c019e24ff0df3e1534270ea Author: Mark Thomas AuthorDate: Fri Oct 9 11:46:03 2020 +0100 Fix URI parsing with encodedSolidusHandling="passthrough" Based on a pull request by willmeck. --- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- test/org/apache/tomcat/util/buf/TestUDecoder.java | 147 ++ webapps/docs/changelog.xml| 6 + 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index 86879d3..f055b2d 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -155,7 +155,9 @@ public final class UDecoder { throw EXCEPTION_SLASH; } case PASS_THROUGH: { -idx += 2; +buff[idx++] = buff[j-2]; +buff[idx++] = buff[j-1]; +buff[idx] = buff[j]; } } } else { diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java b/test/org/apache/tomcat/util/buf/TestUDecoder.java index ca7dd23..f3957b9 100644 --- a/test/org/apache/tomcat/util/buf/TestUDecoder.java +++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java @@ -16,6 +16,8 @@ */ package org.apache.tomcat.util.buf; +import java.io.CharConversionException; +import java.io.IOException; import java.nio.charset.StandardCharsets; import org.junit.Assert; @@ -99,4 +101,149 @@ public class TestUDecoder { String result = UDecoder.URLDecode("\u00ea%c3%aa", StandardCharsets.UTF_8); Assert.assertEquals("\u00ea\u00ea", result); } + + +@Test +public void testURLDecodeStringSolidus01() throws IOException { +doTestSolidus("xx", "xx"); +} + + +@Test +public void testURLDecodeStringSolidus02() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test +public void testURLDecodeStringSolidus03() throws IOException { +doTestSolidus("xx%20xx", "xx xx"); +} + + +@Test +public void testURLDecodeStringSolidus04() throws IOException { +doTestSolidus("%20", " "); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus05a() throws IOException { +doTestSolidus("%2f", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus05b() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2f", result); +} + + +@Test +public void testURLDecodeStringSolidus05c() throws IOException { +String result = doTestSolidus("%2f", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus06a() throws IOException { +doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus06b() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("%2fxx xx", result); +} + + +@Test +public void testURLDecodeStringSolidus06c() throws IOException { +String result = doTestSolidus("%2fxx%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("/xx xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus07a() throws IOException { +doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus07b() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.PASS_THROUGH); +Assert.assertEquals("xx%2f xx", result); +} + + +@Test +public void testURLDecodeStringSolidus07c() throws IOException { +String result = doTestSolidus("xx%2f%20xx", EncodedSolidusHandling.DECODE); +Assert.assertEquals("xx/ xx", result); +} + + +@Test(expected = CharConversionException.class) +public void testURLDecodeStringSolidus08a() throws IOException { +doTestSolidus("xx%20%2fxx", EncodedSolidusHandling.REJECT); +} + + +@Test +public void testURLDecodeStringSolidus08b() throws IOException { +String result = doTestSolidus("xx%20%2fxx", Encode
[tomcat] branch 7.0.x updated: Fix URI parsing with encodedSolidusHandling="passthrough"
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new e99071e Fix URI parsing with encodedSolidusHandling="passthrough" e99071e is described below commit e99071ebac74391e5a8f8790da76d5aff8c71417 Author: Mark Thomas AuthorDate: Fri Oct 9 11:46:03 2020 +0100 Fix URI parsing with encodedSolidusHandling="passthrough" Based on a pull request by willmeck. --- java/org/apache/tomcat/util/buf/UDecoder.java | 4 +- test/org/apache/tomcat/util/buf/TestUDecoder.java | 248 ++ webapps/docs/changelog.xml| 10 + 3 files changed, 261 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/UDecoder.java b/java/org/apache/tomcat/util/buf/UDecoder.java index 6acc893..8bd2dd0 100644 --- a/java/org/apache/tomcat/util/buf/UDecoder.java +++ b/java/org/apache/tomcat/util/buf/UDecoder.java @@ -161,7 +161,9 @@ public final class UDecoder { throw EXCEPTION_SLASH; } case PASS_THROUGH: { -idx += 2; +buff[idx++] = buff[j-2]; +buff[idx++] = buff[j-1]; +buff[idx] = buff[j]; } } } else { diff --git a/test/org/apache/tomcat/util/buf/TestUDecoder.java b/test/org/apache/tomcat/util/buf/TestUDecoder.java new file mode 100644 index 000..edb593a --- /dev/null +++ b/test/org/apache/tomcat/util/buf/TestUDecoder.java @@ -0,0 +1,248 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tomcat.util.buf; + +import java.io.CharConversionException; +import java.io.IOException; + +import org.junit.Assert; +import org.junit.Test; + +public class TestUDecoder { + +@Test +public void testURLDecodeStringInvalid() { +// %n rather than %nn should throw an IAE according to the Javadoc +Exception exception = null; +try { +UDecoder.URLDecode("%5x", B2CConverter.UTF_8); +} catch (Exception e) { +exception = e; +} +Assert.assertTrue(exception instanceof IllegalArgumentException); + +// Edge case trying to trigger ArrayIndexOutOfBoundsException +exception = null; +try { +UDecoder.URLDecode("%5", B2CConverter.UTF_8); +} catch (Exception e) { +exception = e; +} +Assert.assertTrue(exception instanceof IllegalArgumentException); +} + + +@Test +public void testURLDecodeStringValidIso88591Start() { +String result = UDecoder.URLDecode("%41", B2CConverter.ISO_8859_1); +Assert.assertEquals("A", result); +} + + +@Test +public void testURLDecodeStringValidIso88591Middle() { +String result = UDecoder.URLDecode("xx%41xx", B2CConverter.ISO_8859_1); +Assert.assertEquals("xxAxx", result); +} + + +@Test +public void testURLDecodeStringValidIso88591End() { +String result = UDecoder.URLDecode("%41", B2CConverter.ISO_8859_1); +Assert.assertEquals("A", result); +} + + +@Test +public void testURLDecodeStringValidUtf8Start() { +String result = UDecoder.URLDecode("%c3%aa", B2CConverter.UTF_8); +Assert.assertEquals("\u00ea", result); +} + + +@Test +public void testURLDecodeStringValidUtf8Middle() { +String result = UDecoder.URLDecode("xx%c3%aaxx", B2CConverter.UTF_8); +Assert.assertEquals("xx\u00eaxx", result); +} + + +@Test +public void testURLDecodeStringValidUtf8End() { +String result = UDecoder.URLDecode("%c3%aa", B2CConverter.UTF_8); +Assert.assertEquals("\u00ea", result); +} + + +@Test +public void testURLDecodeStringNonAsciiValidNone() { +String result = UDecoder.URLDecode("\u00ea", B2CConverter.UTF_8); +Assert.assertEquals("\u00ea", result); +} + + +@Test +public void testURLDecodeStringNonAsciiValidUtf8() { +
[GitHub] [tomcat] markt-asf commented on pull request #369: UDecoder does not properly convert when EncodedSolidusHandling is PASS_THROUGH and non-solidus encoded characters are present before the sol
markt-asf commented on pull request #369: URL: https://github.com/apache/tomcat/pull/369#issuecomment-706113097 Thanks for the PR. I've applied a variation of your proposed fix along with some additional unit tests to: - 10.0.x for 10.0.0-M10 onwards - 9.0.x for 9.0.40 onwards - 8.5.x for 8.5.60 onwards - 7.0.x for 7.0.107 onwards 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 closed pull request #369: UDecoder does not properly convert when EncodedSolidusHandling is PASS_THROUGH and non-solidus encoded characters are present before the solidus
markt-asf closed pull request #369: URL: https://github.com/apache/tomcat/pull/369 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
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/490 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] 597290af4d55d3b01079a3845c081e6590265082 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] 02/02: Found another place where the version needs to be updated
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 0aae9bd17f5be1c4ca1de199f11a98e855b0389f Author: Mark Thomas AuthorDate: Fri Oct 9 14:08:36 2020 +0100 Found another place where the version needs to be updated --- java/org/apache/jasper/servlet/JspCServletContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java b/java/org/apache/jasper/servlet/JspCServletContext.java index 9d6bf59..2727aed 100644 --- a/java/org/apache/jasper/servlet/JspCServletContext.java +++ b/java/org/apache/jasper/servlet/JspCServletContext.java @@ -495,7 +495,7 @@ public class JspCServletContext implements ServletContext { */ @Override public String getServerInfo() { -return "JspC/ApacheTomcat9"; +return "JspC/ApacheTomcat10"; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Fix BZ 64784. Don't include timestamp in .java file when pre-compiling
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 374690d5793248f26d5894a33bb5ed562e22da91 Author: Mark Thomas AuthorDate: Fri Oct 9 14:02:50 2020 +0100 Fix BZ 64784. Don't include timestamp in .java file when pre-compiling --- java/org/apache/jasper/JspC.java | 13 + java/org/apache/jasper/Options.java| 12 java/org/apache/jasper/compiler/Generator.java | 6 -- webapps/docs/changelog.xml | 6 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java index ff28ed1..3804d2a 100644 --- a/java/org/apache/jasper/JspC.java +++ b/java/org/apache/jasper/JspC.java @@ -1124,6 +1124,19 @@ public class JspC extends Task implements Options { return tagPluginManager; } + +/** + * {@inheritDoc} + * + * Hard-coded to {@code false} for pre-compiled code to enable repeatable + * builds. + */ +@Override +public boolean getGeneratedJavaAddTimestamp() { +return false; +} + + /** * Adds servlet declaration and mapping for the JSP page servlet to the * generated web.xml fragment. diff --git a/java/org/apache/jasper/Options.java b/java/org/apache/jasper/Options.java index 4b100aa..19f3947 100644 --- a/java/org/apache/jasper/Options.java +++ b/java/org/apache/jasper/Options.java @@ -360,4 +360,16 @@ public interface Options { public default boolean getUseInstanceManagerForTags() { return false; } + + +/** + * Should the container include the time the file was generated in the + * comments at the start of a Java file generated from a JSP or tag. + * Defaults to {@code true}. + * + * @return {@code true} to include the timestamp, otherwise don't include it + */ +public default boolean getGeneratedJavaAddTimestamp() { +return true; +} } diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index bcd0412..21593d8 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -3669,8 +3669,10 @@ class Generator { out.println("/*"); out.println(" * Generated by the Jasper component of Apache Tomcat"); out.println(" * Version: " + ctxt.getServletContext().getServerInfo()); -out.println(" * Generated at: " + timestampFormat.format(new Date()) + -" UTC"); +if (ctxt.getOptions().getGeneratedJavaAddTimestamp()) { +out.println(" * Generated at: " + timestampFormat.format(new Date()) + +" UTC"); +} out.println(" * Note: The last modified time of this file was set to"); out.println(" * the last modified time of the source file after"); out.println(" * generation to assist with modification tracking."); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 68859ce..691ec31 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -74,6 +74,12 @@ +64784: Don't include the time the Java file was generated as +a comment when generating Java files for JSPs and/or tags if the Java +file was created during pre-compilation. This is to aid repeatable +builds. (markt) + + 64794: Security exception reading system property on JspRuntimeLibrary use. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (791ef21 -> 0aae9bd)
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 791ef21 Fix URI parsing with encodedSolidusHandling="passthrough" new 374690d Fix BZ 64784. Don't include timestamp in .java file when pre-compiling new 0aae9bd Found another place where the version needs to be updated 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/jasper/JspC.java | 13 + java/org/apache/jasper/Options.java| 12 java/org/apache/jasper/compiler/Generator.java | 6 -- java/org/apache/jasper/servlet/JspCServletContext.java | 2 +- webapps/docs/changelog.xml | 6 ++ 5 files changed, 36 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Fix BZ 64784. Don't include timestamp in .java file when pre-compiling
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 dd6298a Fix BZ 64784. Don't include timestamp in .java file when pre-compiling dd6298a is described below commit dd6298af2726fc5be58fd65460dfc117e2c329e5 Author: Mark Thomas AuthorDate: Fri Oct 9 14:02:50 2020 +0100 Fix BZ 64784. Don't include timestamp in .java file when pre-compiling --- java/org/apache/jasper/JspC.java | 13 + java/org/apache/jasper/Options.java| 11 +++ java/org/apache/jasper/compiler/Generator.java | 6 -- webapps/docs/changelog.xml | 6 ++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java index f211f31..15f983d 100644 --- a/java/org/apache/jasper/JspC.java +++ b/java/org/apache/jasper/JspC.java @@ -1136,6 +1136,19 @@ public class JspC extends Task implements Options { return tagPluginManager; } + +/** + * {@inheritDoc} + * + * Hard-coded to {@code false} for pre-compiled code to enable repeatable + * builds. + */ +@Override +public boolean getGeneratedJavaAddTimestamp() { +return false; +} + + /** * Adds servlet declaration and mapping for the JSP page servlet to the * generated web.xml fragment. diff --git a/java/org/apache/jasper/Options.java b/java/org/apache/jasper/Options.java index 9d0fbf9..248750a 100644 --- a/java/org/apache/jasper/Options.java +++ b/java/org/apache/jasper/Options.java @@ -256,4 +256,15 @@ public interface Options { * the quoting rules in JSP.1.6 applied to the expression. */ public boolean getQuoteAttributeEL(); + +/** + * Should the container include the time the file was generated in the + * comments at the start of a Java file generated from a JSP or tag. + * Defaults to {@code true}. + * + * @return {@code true} to include the timestamp, otherwise don't include it + */ +public default boolean getGeneratedJavaAddTimestamp() { +return true; +} } diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java index 656e122..7f8f7d6 100644 --- a/java/org/apache/jasper/compiler/Generator.java +++ b/java/org/apache/jasper/compiler/Generator.java @@ -3680,8 +3680,10 @@ class Generator { out.println("/*"); out.println(" * Generated by the Jasper component of Apache Tomcat"); out.println(" * Version: " + ctxt.getServletContext().getServerInfo()); -out.println(" * Generated at: " + timestampFormat.format(new Date()) + -" UTC"); +if (ctxt.getOptions().getGeneratedJavaAddTimestamp()) { +out.println(" * Generated at: " + timestampFormat.format(new Date()) + +" UTC"); +} out.println(" * Note: The last modified time of this file was set to"); out.println(" * the last modified time of the source file after"); out.println(" * generation to assist with modification tracking."); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 07b69ba..8696eb9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -74,6 +74,12 @@ +64784: Don't include the time the Java file was generated as +a comment when generating Java files for JSPs and/or tags if the Java +file was created during pre-compilation. This is to aid repeatable +builds. (markt) + + 64794: Security exception reading system property on JspRuntimeLibrary use. (remm) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64784] Add option to remove date from generated Java header comment
https://bz.apache.org/bugzilla/show_bug.cgi?id=64784 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in: - 10.0.x for 10.0.0-M10 onwards - 9.0.x for 9.0.40 onwards Disabled for pre-compiled files. Retained for on-the-fly compilation. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #369: UDecoder does not properly convert when EncodedSolidusHandling is PASS_THROUGH and non-solidus encoded characters are present before the sol
markt-asf commented on pull request #369: URL: https://github.com/apache/tomcat/pull/369#issuecomment-706113097 Thanks for the PR. I've applied a variation of your proposed fix along with some additional unit tests to: - 10.0.x for 10.0.0-M10 onwards - 9.0.x for 9.0.40 onwards - 8.5.x for 8.5.60 onwards - 7.0.x for 7.0.107 onwards 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-jakartaee-migration] darmbrust commented on issue #5: ability to ignore file extensions?
darmbrust commented on issue #5: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/5#issuecomment-705728238 For reference, this is the zip file the tool is failing on: https://github.com/rubyzip/rubyzip/blob/master/test/data/gpbit3stored.zip From the context of the file its failing on, I'm guessing something isn't handling the general purpose bit flag properly when it is encountered: https://en.wikipedia.org/wiki/Zip_(file_format)#Local_file_header 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 closed pull request #369: UDecoder does not properly convert when EncodedSolidusHandling is PASS_THROUGH and non-solidus encoded characters are present before the solidus
markt-asf closed pull request #369: URL: https://github.com/apache/tomcat/pull/369 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
[Bug 59423] amend "No LoginModules configured for ..." with hints what happened from a tomcat point of view
https://bz.apache.org/bugzilla/show_bug.cgi?id=59423 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- This happened because the JAASRealm was used as the default if no other Realm was identified. The reference to LoginModules would make sense to a user who had explicitly configured the JAASRealm but in this instance it was more of a hindrance than a help. All currently supported versions of Tomcat use the NullRealm rather than the JAASRealm as the default Realm (and have done for a number of years) so this issue should no longer occur. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE][RESULT] Release Apache Tomcat 10.0.0-M9
The following votes were cast: Binding: +1: remm, fhanik, mgrigorov, markt, isapir Non-Binding: +1: rotty3000 The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r41866 - /dev/tomcat/tomcat-10/v10.0.0-M9/ /release/tomcat/tomcat-10/v10.0.0-M9/
Author: markt Date: Fri Oct 9 15:59:21 2020 New Revision: 41866 Log: Release Apache Tomcat 10.0.0-M9 Added: release/tomcat/tomcat-10/v10.0.0-M9/ - copied from r41865, dev/tomcat/tomcat-10/v10.0.0-M9/ Removed: dev/tomcat/tomcat-10/v10.0.0-M9/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE][RESULT] Release Apache Tomcat 9.0.39
The following votes were cast: Binding: +1: fhanik, remm, mgrigorov, markt, isapir Non-Binding: +1: rotty3000 The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add release date for 10.0.0-M9
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 781a33e Add release date for 10.0.0-M9 781a33e is described below commit 781a33e6f83faad4f0a3475540c694c9d15c7f11 Author: Mark Thomas AuthorDate: Fri Oct 9 17:00:13 2020 +0100 Add release date for 10.0.0-M9 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 691ec31..a44879c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r41867 - /dev/tomcat/tomcat-9/v9.0.39/ /release/tomcat/tomcat-9/v9.0.39/
Author: markt Date: Fri Oct 9 16:04:44 2020 New Revision: 41867 Log: Release Apache Tomcat 9.0.39 Added: release/tomcat/tomcat-9/v9.0.39/ - copied from r41866, dev/tomcat/tomcat-9/v9.0.39/ Removed: dev/tomcat/tomcat-9/v9.0.39/ - 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: Add release date for 9.0.39
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 f2407e6 Add release date for 9.0.39 f2407e6 is described below commit f2407e621a3eac59374ee69685d0461787d389df Author: Mark Thomas AuthorDate: Fri Oct 9 17:03:55 2020 +0100 Add release date for 9.0.39 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8696eb9..2cc3d22 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add release date for 10.0.0-M9
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 781a33e Add release date for 10.0.0-M9 781a33e is described below commit 781a33e6f83faad4f0a3475540c694c9d15c7f11 Author: Mark Thomas AuthorDate: Fri Oct 9 17:00:13 2020 +0100 Add release date for 10.0.0-M9 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 691ec31..a44879c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add release date for 10.0.0-M9
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 781a33e Add release date for 10.0.0-M9 781a33e is described below commit 781a33e6f83faad4f0a3475540c694c9d15c7f11 Author: Mark Thomas AuthorDate: Fri Oct 9 17:00:13 2020 +0100 Add release date for 10.0.0-M9 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 691ec31..a44879c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - 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: Add release date for 9.0.39
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 f2407e6 Add release date for 9.0.39 f2407e6 is described below commit f2407e621a3eac59374ee69685d0461787d389df Author: Mark Thomas AuthorDate: Fri Oct 9 17:03:55 2020 +0100 Add release date for 9.0.39 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8696eb9..2cc3d22 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - 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: Add release date for 9.0.39
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 f2407e6 Add release date for 9.0.39 f2407e6 is described below commit f2407e621a3eac59374ee69685d0461787d389df Author: Mark Thomas AuthorDate: Fri Oct 9 17:03:55 2020 +0100 Add release date for 9.0.39 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8696eb9..2cc3d22 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add release date for 10.0.0-M9
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 781a33e Add release date for 10.0.0-M9 781a33e is described below commit 781a33e6f83faad4f0a3475540c694c9d15c7f11 Author: Mark Thomas AuthorDate: Fri Oct 9 17:00:13 2020 +0100 Add release date for 10.0.0-M9 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 691ec31..a44879c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -86,7 +86,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Partial fix for BZ 63362 provide h2 request statistics
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 62a684c Partial fix for BZ 63362 provide h2 request statistics 62a684c is described below commit 62a684cd2b2039a68e74813cf4e20fc95a2cebe4 Author: Mark Thomas AuthorDate: Wed Jun 24 19:24:17 2020 +0100 Partial fix for BZ 63362 provide h2 request statistics --- java/org/apache/coyote/AbstractProtocol.java | 35 +++ java/org/apache/coyote/LocalStrings.properties| 1 + java/org/apache/coyote/UpgradeProtocol.java | 22 java/org/apache/coyote/http2/Http2Protocol.java | 41 +++ java/org/apache/coyote/http2/StreamProcessor.java | 6 webapps/docs/changelog.xml| 4 +++ 6 files changed, 102 insertions(+), 7 deletions(-) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index e214f80..159531e 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -69,12 +69,6 @@ public abstract class AbstractProtocol implements ProtocolHandler, /** - * Name of MBean for the Global Request Processor. - */ -protected ObjectName rgOname = null; - - -/** * Unique ID for this connector. Only used if the connector is configured * to use a random port as the port will change if stop(), start() is * called. @@ -145,6 +139,14 @@ public abstract class AbstractProtocol implements ProtocolHandler, // --- Properties managed by the ProtocolHandler /** + * Name of MBean for the Global Request Processor. + */ +protected ObjectName rgOname = null; +public ObjectName getGlobalRequestProcessorMBeanName() { +return rgOname; +} + +/** * The adapter provides the link between the ProtocolHandler and the * connector. */ @@ -546,7 +548,8 @@ public abstract class AbstractProtocol implements ProtocolHandler, } if (this.domain != null) { -rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +ObjectName rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +this.rgOname = rgOname; Registry.getRegistry(null, null).registerComponent( getHandler().getGlobal(), rgOname, null); } @@ -556,6 +559,13 @@ public abstract class AbstractProtocol implements ProtocolHandler, endpoint.setDomain(domain); endpoint.init(); + +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +// Implementation note: Failure of one upgrade protocol fails the +// whole Connector +upgradeProtocol.init(); +} } @@ -669,6 +679,16 @@ public abstract class AbstractProtocol implements ProtocolHandler, logPortOffset(); } +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +try { +upgradeProtocol.destroy(); +} catch (Throwable t) { +ExceptionUtils.handleThrowable(t); + getLog().error(sm.getString("abstractProtocol.upgradeProtocolDestroyError"), t); +} +} + try { endpoint.destroy(); } finally { @@ -686,6 +706,7 @@ public abstract class AbstractProtocol implements ProtocolHandler, } } +ObjectName rgOname = getGlobalRequestProcessorMBeanName(); if (rgOname != null) { Registry.getRegistry(null, null).unregisterComponent(rgOname); } diff --git a/java/org/apache/coyote/LocalStrings.properties b/java/org/apache/coyote/LocalStrings.properties index 83960cb..43c8d64 100644 --- a/java/org/apache/coyote/LocalStrings.properties +++ b/java/org/apache/coyote/LocalStrings.properties @@ -36,6 +36,7 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named [{0}] from MBean server [{1}] abstractProtocol.processorRegisterError=Error registering request processor abstractProtocol.processorUnregisterError=Error unregistering request processor +abstractProtocol.upgradeProtocolDestroyError=Error destroying upgrade protocol abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting processors abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting processors diff --git a/java/org/apache/coyote/UpgradeProtocol.java b/java/org/apache/coyote/UpgradeProtocol.java index dc840df..
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/5490 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] 781a33e6f83faad4f0a3475540c694c9d15c7f11 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 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/5491 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] 781a33e6f83faad4f0a3475540c694c9d15c7f11 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] branch 9.0.x updated: Partial fix for BZ 63362 provide h2 request statistics
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 708b169 Partial fix for BZ 63362 provide h2 request statistics 708b169 is described below commit 708b1694de60e8c1fd0c3635da2f5a1aa701970f Author: Mark Thomas AuthorDate: Wed Jun 24 19:24:17 2020 +0100 Partial fix for BZ 63362 provide h2 request statistics --- java/org/apache/coyote/AbstractProtocol.java | 35 + java/org/apache/coyote/LocalStrings.properties| 1 + java/org/apache/coyote/UpgradeProtocol.java | 46 ++ java/org/apache/coyote/http2/Http2Protocol.java | 48 +-- java/org/apache/coyote/http2/StreamProcessor.java | 6 +++ webapps/docs/changelog.xml| 4 ++ 6 files changed, 130 insertions(+), 10 deletions(-) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index d9bab30..ab9dd38 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -69,12 +69,6 @@ public abstract class AbstractProtocol implements ProtocolHandler, /** - * Name of MBean for the Global Request Processor. - */ -protected ObjectName rgOname = null; - - -/** * Unique ID for this connector. Only used if the connector is configured * to use a random port as the port will change if stop(), start() is * called. @@ -145,6 +139,14 @@ public abstract class AbstractProtocol implements ProtocolHandler, // --- Properties managed by the ProtocolHandler /** + * Name of MBean for the Global Request Processor. + */ +protected ObjectName rgOname = null; +public ObjectName getGlobalRequestProcessorMBeanName() { +return rgOname; +} + +/** * The adapter provides the link between the ProtocolHandler and the * connector. */ @@ -569,7 +571,8 @@ public abstract class AbstractProtocol implements ProtocolHandler, } if (this.domain != null) { -rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +ObjectName rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +this.rgOname = rgOname; Registry.getRegistry(null, null).registerComponent( getHandler().getGlobal(), rgOname, null); } @@ -579,6 +582,13 @@ public abstract class AbstractProtocol implements ProtocolHandler, endpoint.setDomain(domain); endpoint.init(); + +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +// Implementation note: Failure of one upgrade protocol fails the +// whole Connector +upgradeProtocol.init(); +} } @@ -692,6 +702,16 @@ public abstract class AbstractProtocol implements ProtocolHandler, logPortOffset(); } +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +try { +upgradeProtocol.destroy(); +} catch (Throwable t) { +ExceptionUtils.handleThrowable(t); + getLog().error(sm.getString("abstractProtocol.upgradeProtocolDestroyError"), t); +} +} + try { endpoint.destroy(); } finally { @@ -709,6 +729,7 @@ public abstract class AbstractProtocol implements ProtocolHandler, } } +ObjectName rgOname = getGlobalRequestProcessorMBeanName(); if (rgOname != null) { Registry.getRegistry(null, null).unregisterComponent(rgOname); } diff --git a/java/org/apache/coyote/LocalStrings.properties b/java/org/apache/coyote/LocalStrings.properties index 83960cb..43c8d64 100644 --- a/java/org/apache/coyote/LocalStrings.properties +++ b/java/org/apache/coyote/LocalStrings.properties @@ -36,6 +36,7 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named [{0}] from MBean server [{1}] abstractProtocol.processorRegisterError=Error registering request processor abstractProtocol.processorUnregisterError=Error unregistering request processor +abstractProtocol.upgradeProtocolDestroyError=Error destroying upgrade protocol abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting processors abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting processors diff --git a/java/org/apache/coyote/UpgradeProtocol.java b/java/org/apache/coyote/UpgradeProtocol.java index dc84
[tomcat] branch 8.5.x updated: Partial fix for BZ 63362 provide h2 request statistics
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 cc76b83 Partial fix for BZ 63362 provide h2 request statistics cc76b83 is described below commit cc76b8368c5f93154b5dc71cfbad464fff21586f Author: Mark Thomas AuthorDate: Wed Jun 24 19:24:17 2020 +0100 Partial fix for BZ 63362 provide h2 request statistics --- java/org/apache/coyote/AbstractProtocol.java | 44 +++ java/org/apache/coyote/LocalStrings.properties| 1 + java/org/apache/coyote/http2/Http2Protocol.java | 40 + java/org/apache/coyote/http2/StreamProcessor.java | 6 webapps/docs/changelog.xml| 4 +++ 5 files changed, 88 insertions(+), 7 deletions(-) diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index bbb897a..dd1359b 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -35,6 +35,7 @@ import javax.management.ObjectName; import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; +import org.apache.coyote.http2.Http2Protocol; import org.apache.juli.logging.Log; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.ExceptionUtils; @@ -63,12 +64,6 @@ public abstract class AbstractProtocol implements ProtocolHandler, /** - * Name of MBean for the Global Request Processor. - */ -protected ObjectName rgOname = null; - - -/** * Unique ID for this connector. Only used if the connector is configured * to use a random port as the port will change if stop(), start() is * called. @@ -140,6 +135,14 @@ public abstract class AbstractProtocol implements ProtocolHandler, // --- Properties managed by the ProtocolHandler /** + * Name of MBean for the Global Request Processor. + */ +protected ObjectName rgOname = null; +public ObjectName getGlobalRequestProcessorMBeanName() { +return rgOname; +} + +/** * The adapter provides the link between the ProtocolHandler and the * connector. */ @@ -575,7 +578,8 @@ public abstract class AbstractProtocol implements ProtocolHandler, } if (this.domain != null) { -rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +ObjectName rgOname = new ObjectName(domain + ":type=GlobalRequestProcessor,name=" + getName()); +this.rgOname = rgOname; Registry.getRegistry(null, null).registerComponent( getHandler().getGlobal(), rgOname, null); } @@ -585,6 +589,17 @@ public abstract class AbstractProtocol implements ProtocolHandler, endpoint.setDomain(domain); endpoint.init(); + +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +// Need to do this as we can't add methods to UpgradeProtocol +// without running the risk of breaking a custom upgrade protocol +if (upgradeProtocol instanceof Http2Protocol) { +// Implementation note: Failure of one upgrade protocol fails the +// whole Connector +((Http2Protocol) upgradeProtocol).init(); +} +} } @@ -649,6 +664,20 @@ public abstract class AbstractProtocol implements ProtocolHandler, getLog().info(sm.getString("abstractProtocolHandler.destroy", getName())); } +UpgradeProtocol[] upgradeProtocols = findUpgradeProtocols(); +for (UpgradeProtocol upgradeProtocol : upgradeProtocols) { +try { +// Need to do this as we can't add methods to UpgradeProtocol +// without running the risk of breaking a custom upgrade protocol +if (upgradeProtocol instanceof Http2Protocol) { +((Http2Protocol) upgradeProtocol).destroy(); +} +} catch (Throwable t) { +ExceptionUtils.handleThrowable(t); + getLog().error(sm.getString("abstractProtocol.upgradeProtocolDestroyError"), t); +} +} + try { endpoint.destroy(); } finally { @@ -666,6 +695,7 @@ public abstract class AbstractProtocol implements ProtocolHandler, } } +ObjectName rgOname = getGlobalRequestProcessorMBeanName(); if (rgOname != null) { Registry.getRegistry(null, null).unregisterComponent(rgOname); } diff --git a/java/org/apache/coyote/LocalStrings.properties b/java/org/apache/coyote/LocalStrings.properties index 1aeb314..77911
[Bug 63362] GlobalRequestProcessor statistics in MBean does not count Websocket communication
https://bz.apache.org/bugzilla/show_bug.cgi?id=63362 --- Comment #7 from Mark Thomas --- Fixed for HTTP/2 in: - 10.0.x for 10.0.0-M10 onwards - 9.0.x for 9.0.40 onwards - 8.5.x for 8.5.60 onwards Still thinking about how to tackle WebSocket. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE][RESULT] Release Apache Tomcat 8.5.59
The following votes were cast: Binding: +1: fhanik, remm, mgrigorov, markt, isapir Non-Binding: +1: rotty3000 The vote therefore passes. Thank you to everyone who contributed to this this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r41868 - /dev/tomcat/tomcat-8/v8.5.59/ /release/tomcat/tomcat-8/v8.5.59/
Author: markt Date: Fri Oct 9 17:53:35 2020 New Revision: 41868 Log: Release Apache Tomcat 8.5.59 Added: release/tomcat/tomcat-8/v8.5.59/ - copied from r41867, dev/tomcat/tomcat-8/v8.5.59/ Removed: dev/tomcat/tomcat-8/v8.5.59/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55160] NIO connectionUploadTimeout can't work
https://bz.apache.org/bugzilla/show_bug.cgi?id=55160 garrison.ku...@gmail.com changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #2 from garrison.ku...@gmail.com --- This bug has resurfaced. The fix https://github.com/apache/tomcat/commit/dc08904d6f515d90e49f24bf635c955156ce4cb0 was reverted 4 years later by https://github.com/apache/tomcat/commit/c8ea5646a66d7b31974f9594787961a44019c045 The read timeout is once again the connectionTimeout and not the connectionUploadTimeout. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55160] NIO connectionUploadTimeout can't work
https://bz.apache.org/bugzilla/show_bug.cgi?id=55160 Garrison Kubis changed: What|Removed |Added CC||garrison.ku...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org