(tomcat) 03/03: Update tests after HTTP/2 improvements

[markt]

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

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

commit 0be993676482b00af8edc1cb7f12f0ab292bfea6
Author: Mark Thomas 
AuthorDate: Thu Jan 25 14:48:30 2024 +

Update tests after HTTP/2 improvements
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 056d928dbd..5e916528f7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -164,7 +164,7 @@ public class TestHttp2Limits extends Http2TestBase {
 // 500ms per frame write delay to give server a chance to process the
 // stream reset and the connection reset before the request is fully
 // sent.
-doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.CONNECTION_RESET);
+doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.STREAM_RESET_THEN_CONNECTION_RESET);
 }
 
 
@@ -278,6 +278,13 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertNull(e);
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+// Expect a stream reset
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+}
+//$FALL-THROUGH$
 case CONNECTION_RESET: {
 // This message uses i18n and needs to be used in a regular
 // expression (since we don't know the connection ID). 
Generate the
@@ -522,6 +529,10 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertEquals("3-RST-[11]\n", output.getTrace());
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+Assert.fail("Not used");
+break;
+}
 case CONNECTION_RESET: {
 // NIO2 can sometimes send window updates depending timing
 skipWindowSizeFrames();
@@ -544,7 +555,7 @@ public class TestHttp2Limits extends Http2TestBase {
 NONE,
 STREAM_RESET,
 CONNECTION_RESET,
-
+STREAM_RESET_THEN_CONNECTION_RESET,
 }
 
 


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

(tomcat) 03/03: Update tests after HTTP/2 improvements

[markt]

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

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

commit 7be21696bf31a19828168de3db94767030d69ec6
Author: Mark Thomas 
AuthorDate: Thu Jan 25 14:48:30 2024 +

Update tests after HTTP/2 improvements
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index b3214eb012..7b891fbfff 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -165,7 +165,7 @@ public class TestHttp2Limits extends Http2TestBase {
 // 500ms per frame write delay to give server a chance to process the
 // stream reset and the connection reset before the request is fully
 // sent.
-doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.CONNECTION_RESET);
+doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.STREAM_RESET_THEN_CONNECTION_RESET);
 }
 
 
@@ -279,6 +279,13 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertNull(e);
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+// Expect a stream reset
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+}
+//$FALL-THROUGH$
 case CONNECTION_RESET: {
 // This message uses i18n and needs to be used in a regular
 // expression (since we don't know the connection ID). 
Generate the
@@ -523,6 +530,10 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertEquals("3-RST-[11]\n", output.getTrace());
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+Assert.fail("Not used");
+break;
+}
 case CONNECTION_RESET: {
 // NIO2 can sometimes send window updates depending timing
 skipWindowSizeFrames();
@@ -545,7 +556,7 @@ public class TestHttp2Limits extends Http2TestBase {
 NONE,
 STREAM_RESET,
 CONNECTION_RESET,
-
+STREAM_RESET_THEN_CONNECTION_RESET,
 }
 
 


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

(tomcat) 03/03: Update tests after HTTP/2 improvements

[markt]

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

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

commit df1114c74fb2a95c074a3dc05f251867f58ddf97
Author: Mark Thomas 
AuthorDate: Thu Jan 25 14:48:30 2024 +

Update tests after HTTP/2 improvements
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 056d928dbd..5e916528f7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -164,7 +164,7 @@ public class TestHttp2Limits extends Http2TestBase {
 // 500ms per frame write delay to give server a chance to process the
 // stream reset and the connection reset before the request is fully
 // sent.
-doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.CONNECTION_RESET);
+doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.STREAM_RESET_THEN_CONNECTION_RESET);
 }
 
 
@@ -278,6 +278,13 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertNull(e);
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+// Expect a stream reset
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+}
+//$FALL-THROUGH$
 case CONNECTION_RESET: {
 // This message uses i18n and needs to be used in a regular
 // expression (since we don't know the connection ID). 
Generate the
@@ -522,6 +529,10 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertEquals("3-RST-[11]\n", output.getTrace());
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+Assert.fail("Not used");
+break;
+}
 case CONNECTION_RESET: {
 // NIO2 can sometimes send window updates depending timing
 skipWindowSizeFrames();
@@ -544,7 +555,7 @@ public class TestHttp2Limits extends Http2TestBase {
 NONE,
 STREAM_RESET,
 CONNECTION_RESET,
-
+STREAM_RESET_THEN_CONNECTION_RESET,
 }
 
 


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

(tomcat) 03/03: Update tests after HTTP/2 improvements

[markt]

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

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

commit 4bacb383665bb3cdd0cec1293ac275999123a9dc
Author: Mark Thomas 
AuthorDate: Thu Jan 25 14:48:30 2024 +

Update tests after HTTP/2 improvements
---
 test/org/apache/coyote/http2/TestHttp2Limits.java | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java 
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index b3214eb012..7b891fbfff 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -165,7 +165,7 @@ public class TestHttp2Limits extends Http2TestBase {
 // 500ms per frame write delay to give server a chance to process the
 // stream reset and the connection reset before the request is fully
 // sent.
-doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.CONNECTION_RESET);
+doTestHeaderLimits(1, 32 * 1024, 1024, 500, 
FailureMode.STREAM_RESET_THEN_CONNECTION_RESET);
 }
 
 
@@ -279,6 +279,13 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertNull(e);
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+// Expect a stream reset
+parser.readFrame();
+Assert.assertEquals("3-RST-[11]\n", output.getTrace());
+output.clearTrace();
+}
+//$FALL-THROUGH$
 case CONNECTION_RESET: {
 // This message uses i18n and needs to be used in a regular
 // expression (since we don't know the connection ID). 
Generate the
@@ -523,6 +530,10 @@ public class TestHttp2Limits extends Http2TestBase {
 Assert.assertEquals("3-RST-[11]\n", output.getTrace());
 break;
 }
+case STREAM_RESET_THEN_CONNECTION_RESET: {
+Assert.fail("Not used");
+break;
+}
 case CONNECTION_RESET: {
 // NIO2 can sometimes send window updates depending timing
 skipWindowSizeFrames();
@@ -545,7 +556,7 @@ public class TestHttp2Limits extends Http2TestBase {
 NONE,
 STREAM_RESET,
 CONNECTION_RESET,
-
+STREAM_RESET_THEN_CONNECTION_RESET,
 }
 
 


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

(tomcat) 03/03: Update the migration tool for Jakarta EE to 1.0.8

[markt]

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

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

commit 4f916e54e255094cf03ae31307c63d289dd8b981
Author: Mark Thomas 
AuthorDate: Tue Feb 6 22:21:22 2024 +

Update the migration tool for Jakarta EE to 1.0.8
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ca72ca23cd..5054a8a65b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -312,10 +312,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
 
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
 
 # - Tomcat Migration Tool for Jakarta EE -
-migration-lib.version=1.0.7
+migration-lib.version=1.0.8
 migration-lib.checksum.enabled=true
 migration-lib.checksum.algorithm=MD5|SHA-1
-migration-lib.checksum.value=378eeda7171284210688349f31e60e73|2baf7f729b409b47467c2ea998216441bf1c33cc
+migration-lib.checksum.value=bc5265465d7c641bbd5c9f2b057decc1|56eb518000183b5f3eface92fb9e9ccd1cbaee09
 
 migration-lib.home=${base.path}/migration-${migration-lib.version}
 
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5dd92d309e..b9e76cf398 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,10 @@
   
 Update JSign to 6.0. (markt)
   
+  
+Update the packaged version of the Tomcat Migration Tool for Jakarta EE
+to 1.0.7. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update Jacoco to 0.8.9

[markt]

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

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

commit c107d6585c61bb8157660b7e92adc97c85f7670f
Author: Mark Thomas 
AuthorDate: Wed Apr 12 17:06:49 2023 +0100

Update Jacoco to 0.8.9
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 9fc9f09185..3f3134c001 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -289,10 +289,10 @@ 
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
 
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 
 # - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
 jacoco.checksum.enabled=true
 jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
 jacoco.home=${base.path}/jacoco-${jacoco.version}
 jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 52bcd49475..36bed45866 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -263,6 +263,9 @@
   
 Update Checkstyle to 10.9.3. (markt)
   
+  
+Update Jacoco to 0.8.9. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update Jacoco to 0.8.9

[markt]

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

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

commit d819cda0d2eb1dd90083dfae1852284e5f736eb0
Author: Mark Thomas 
AuthorDate: Wed Apr 12 17:06:49 2023 +0100

Update Jacoco to 0.8.9
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c2a96ab0a2..56a54cc5be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -285,10 +285,10 @@ 
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
 
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 
 # - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
 jacoco.checksum.enabled=true
 jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
 jacoco.home=${base.path}/jacoco-${jacoco.version}
 jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7fa651b1a3..50dea491a6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -278,6 +278,9 @@
   
 Update Checkstyle to 10.9.3. (markt)
   
+  
+Update Jacoco to 0.8.9. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update CheckStyle to 10.7.0

[markt]

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

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

commit ca3b8ce15b5c80e79a90d8ab026014a7dd6ccdbd
Author: Mark Thomas 
AuthorDate: Tue Feb 14 12:05:25 2023 +

Update CheckStyle to 10.7.0
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3ea02aa671..39619919c1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@ 
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
 
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
 
 # - Checkstyle, version 6.16 or later -
-checkstyle.version=10.6.0
+checkstyle.version=10.7.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=424ec002f7246c081df0d24168ba3da20af06d001a1d77afead5a730fe2565bc7db5025ccdefe4d27b4545c4358cb20ac845365162011e63e216aabd6f7adf38
+checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
 
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar


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

[tomcat] 03/03: Update tests for Java 7

[markt]

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

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

commit 8268578e73a5f2ebb6001cd08e44dfc2c68502d8
Author: Mark Thomas 
AuthorDate: Thu Jan 5 15:15:18 2023 +

Update tests for Java 7
---
 .../util/buf/TestMessageBytesConversion.java   | 144 +
 1 file changed, 116 insertions(+), 28 deletions(-)

diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytesConversion.java 
b/test/org/apache/tomcat/util/buf/TestMessageBytesConversion.java
index 8534738195..4bd413ace1 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytesConversion.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytesConversion.java
@@ -20,7 +20,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Consumer;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -132,33 +131,33 @@ public class TestMessageBytesConversion {
 
 
 public static enum MessageBytesType {
-BYTE((x) -> x.setBytes(PREVIOUS_BYTES, 0, PREVIOUS_BYTES.length),
-(x) -> x.setBytes(EXPECTED_BYTES, 0, EXPECTED_BYTES.length),
-(x) -> {x.toBytes(); 
Assert.assertTrue(x.getByteChunk().equals(EXPECTED_BYTES, 0, 
EXPECTED_BYTES.length) );},
-(x) -> {x.toBytes(); 
Assert.assertTrue(x.getByteChunk().isNull());}),
-
-CHAR((x) -> x.setChars(PREVIOUS_CHARS, 0, PREVIOUS_CHARS.length),
-(x) -> x.setChars(EXPECTED_CHARS, 0, EXPECTED_CHARS.length),
-(x) -> {x.toChars(); Assert.assertArrayEquals(EXPECTED_CHARS, 
x.getCharChunk().getChars());},
-(x) -> {x.toChars(); 
Assert.assertTrue(x.getCharChunk().isNull());}),
-
-STRING((x) -> x.setString(PREVIOUS_STRING),
-(x) -> x.setString(EXPECTED_STRING),
-(x) -> Assert.assertEquals(EXPECTED_STRING, x.toString()),
-(x) -> Assert.assertNull(x.toString())),
-
-NULL((x) -> x.setString(null),
-(x) -> x.setString(null),
-(x) -> Assert.assertTrue(x.isNull()),
-(x) -> Assert.assertTrue(x.isNull()));
-
-private final Consumer setPrevious;
-private final Consumer setExpected;
-private final Consumer checkExpected;
-private final Consumer checkNull;
-
-private MessageBytesType(Consumer setPrevious, 
Consumer setExpected,
-Consumer checkExpected, Consumer 
checkNull) {
+BYTE(setBytes(PREVIOUS_BYTES),
+setBytes(EXPECTED_BYTES),
+assertBytes(EXPECTED_BYTES),
+assertBytes(null)),
+
+CHAR(setChars(PREVIOUS_CHARS),
+setChars(EXPECTED_CHARS),
+assertChars(EXPECTED_CHARS),
+assertChars(null)),
+
+STRING(setString(PREVIOUS_STRING),
+setString(EXPECTED_STRING),
+assertString(EXPECTED_STRING),
+assertString(null)),
+
+NULL(setString(null),
+setString(null),
+assertNull(),
+assertNull());
+
+private final MessageBytesConsumer setPrevious;
+private final MessageBytesConsumer setExpected;
+private final MessageBytesConsumer checkExpected;
+private final MessageBytesConsumer checkNull;
+
+private MessageBytesType(MessageBytesConsumer setPrevious, 
MessageBytesConsumer setExpected,
+MessageBytesConsumer checkExpected, MessageBytesConsumer 
checkNull) {
 this.setPrevious = setPrevious;
 this.setExpected = setExpected;
 this.checkExpected = checkExpected;
@@ -204,4 +203,93 @@ public class TestMessageBytesConversion {
 
 return results;
 }
+
+
+private interface MessageBytesConsumer {
+void accept(MessageBytes mb);
+}
+
+
+private static MessageBytesConsumer setBytes(final byte[] b) {
+return new MessageBytesConsumer() {
+@Override
+public void accept(MessageBytes mb) {
+mb.setBytes(b, 0, b.length);
+}
+};
+}
+
+
+private static MessageBytesConsumer assertBytes(final byte[] b) {
+return new MessageBytesConsumer() {
+@Override
+public void accept(MessageBytes mb) {
+mb.toBytes();
+if (b == null) {
+Assert.assertTrue(mb.getByteChunk().isNull());
+} else {
+Assert.assertTrue(mb.getByteChunk().equals(b, 0, 
b.length));
+}
+}
+};
+}
+
+
+private static MessageBytesConsumer setChars(final char[] c) {
+return new MessageBytesConsumer() {
+@Override
+public void accept(MessageBytes mb) {
+mb.setChars(c, 0, c.length);
+ 

[tomcat] 03/03: Update package renamed fork of Commons Codec

[markt]

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

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

commit e529969d152c9ffa17226ee3cd1225b471cb0d59
Author: Mark Thomas 
AuthorDate: Tue Jan 3 12:41:45 2023 +

Update package renamed fork of Commons Codec
---
 MERGE.txt| 4 ++--
 java/org/apache/tomcat/util/codec/binary/BaseNCodec.java | 5 +++--
 webapps/docs/changelog.xml   | 6 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index de8e38d901..5673ec8d95 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-2ee2bff580c7138545377628074173412c27290c (2023-01-02)
+2ee2bff580c7138545377628074173412c27290c (2023-01-03)
 
 Codec
 -
@@ -45,7 +45,7 @@ Unused code is removed
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-ae32a3f2fa6b722b8ad67bd125a52edb78932314 (2022-11-29)
+f03cbd3ba741758ead9f59bc07e6688a739a4813 (2023-01-03)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java 
b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
index 09e647ff97..0bfcf7312a 100644
--- a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
+++ b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
@@ -16,6 +16,8 @@
  */
 package org.apache.tomcat.util.codec.binary;
 
+import java.util.Arrays;
+
 import org.apache.tomcat.util.buf.HexUtils;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -206,8 +208,7 @@ public abstract class BaseNCodec {
 newCapacity = createPositiveCapacity(minCapacity);
 }
 
-final byte[] b = new byte[newCapacity];
-System.arraycopy(context.buffer, 0, b, 0, context.buffer.length);
+final byte[] b = Arrays.copyOf(context.buffer, newCapacity);
 context.buffer = b;
 return b;
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bed020552d..b80ff1a41d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -164,9 +164,13 @@
 Jakarta EE to 1.0.6. (markt)
   
   
-Update the internal fork of Apache Commons BCEL to 2ee2bff (2023-01-02,
+Update the internal fork of Apache Commons BCEL to 2ee2bff (2023-01-03,
 6.7.1-SNAPSHOT). (markt)
   
+  
+Update the internal fork of Apache Commons Codec to 3eafd6c 
(2023-01-03,
+1.16-SNAPSHOT). (markt)
+  
   
 Update the internal fork of Apache Commons FileUpload to 34eb241
 (2023-01-03, 2.0-SNAPSHOT). (markt)


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

[tomcat] 03/03: Update changelog

[markt]

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

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

commit be23ed38972700125fa3122c68bf51cdded78a98
Author: Mark Thomas 
AuthorDate: Tue Nov 8 11:49:22 2022 +

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fae235b53d..22c06cb070 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -206,6 +206,11 @@
   
 Improvements to Spanish translations. (markt)
   
+  
+Correct a regression in the removal of the APR connector that broke
+Graal native image support. Pull request 564 provided by
+Sébastien Deleuze. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update the WebSocket JAR to use the Servlet 6.0 web fragment schema

[markt]

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

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

commit 595428ec3fcf83fd437f3f7b696571fc4d1e07a3
Author: Mark Thomas 
AuthorDate: Tue May 17 08:46:07 2022 +0100

Update the WebSocket JAR to use the Servlet 6.0 web fragment schema
---
 res/META-INF/tomcat-websocket.jar/web-fragment.xml | 4 ++--
 webapps/docs/changelog.xml | 8 
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml 
b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
index 6a2d3159ce..378fe7d1f7 100644
--- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
+++ b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
@@ -18,8 +18,8 @@
 https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
-  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
-  version="5.0"
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd;
+  version="6.0"
   metadata-complete="true">
   org_apache_tomcat_websocket
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 881ea2cdde..9fb16d17ae 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -117,6 +117,14 @@
   
 
   
+  
+
+  
+Update the XML schema used by the web fragment defined for the 
WebSocket
+JAR to use the Servlet 6.0 web fragment schema. (markt)
+  
+
+  
   
 
   


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

[tomcat] 03/03: Update (currently unused) reproducible build timestamp

[markt]

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

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

commit 09db648ff9e721c924d639ecfd8bfe5631e1b797
Author: Mark Thomas 
AuthorDate: Wed Jan 12 16:04:39 2022 +

Update (currently unused) reproducible build timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 490483d..ab0e0c2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -38,8 +38,8 @@ version.suffix=-dev
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2021-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+#2022-01-12T06:00:00Z
+#ant.tstamp.now=1642003200
 
 # - Source control flags -
 git.branch=8.5.x

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

[tomcat] 03/03: Update (currently unused) reproducible build timestamp

[markt]

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

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

commit 974b78d29ccb7610fe0d6b5c36541da2242f8614
Author: Mark Thomas 
AuthorDate: Wed Jan 12 16:04:39 2022 +

Update (currently unused) reproducible build timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 5229029..4a9d713 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -38,8 +38,8 @@ version.suffix=-dev
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2021-12-02T10:10:00Z
-#ant.tstamp.now=1638439200
+#2022-01-12T06:00:00Z
+#ant.tstamp.now=1642003200
 
 # - Source control flags -
 git.branch=9.0.x

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

[tomcat] 03/03: Update (currently unused) reproducible build timestamp

[markt]

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

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

commit d67104f4d3389dfe01f11f9a23555dd8363ef29b
Author: Mark Thomas 
AuthorDate: Wed Jan 12 16:04:39 2022 +

Update (currently unused) reproducible build timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 109263d..7b060d2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -38,8 +38,8 @@ version.suffix=-dev
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2021-09-28T12:09:00Z
-#ant.tstamp.now=1632819600
+#2022-01-12T06:00:00Z
+#ant.tstamp.now=1642003200
 
 # - Source control flags -
 git.branch=10.0.x

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

[tomcat] 03/03: Update documentation to reflect removal of APR connector

[markt]

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

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

commit a3a6a89a2fcbe5d432640e7b31808eeb591541ce
Author: Mark Thomas 
AuthorDate: Thu Aug 19 19:16:39 2021 +0100

Update documentation to reflect removal of APR connector
---
 BUILDING.txt  |  24 ++--
 RUNNING.txt   |  12 +-
 TOMCAT-NEXT.txt   |   4 +
 build.properties.default  |   2 -
 conf/server.xml   |   3 +-
 res/tomcat.nsi|   2 +-
 test/org/apache/coyote/http2/TestHttp2Limits.java |   6 +-
 webapps/docs/apr.xml  |  59 +-
 webapps/docs/config/ajp.xml   |  59 +-
 webapps/docs/config/http.xml  | 131 +++---
 webapps/docs/manager-howto.xml|   3 +-
 webapps/docs/ssl-howto.xml|  87 ++
 12 files changed, 57 insertions(+), 335 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 07f462f..0670db8 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -326,29 +326,29 @@ directory:
 
 output/build/logs
 
-By default the testsuite is run three times to test 3 different
-implementations of Tomcat connectors: NIO, NIO2 and APR. (If you are not
-familiar with Tomcat connectors, see config/http.html in documentation for
-details).
+By default the testsuite is run twice to test the 2 different implementations
+of Tomcat connectors: NIO and NIO2. (If you are not familiar with Tomcat
+connectors, see config/http.html in documentation for details).
 
-The 3 runs are enabled and disabled individually by the following
+The 2 runs are enabled and disabled individually by the following
 properties, which all are "true" by default:
 
 execute.test.nio=true
 execute.test.nio2=true
-execute.test.apr=true
 
-The APR connector can be tested only if Tomcat-Native library binaries are
-found by the testsuite. The "test.apr.loc" property specifies the directory
-where the library binaries are located.
+The SSL tests will be run twice. Once with the JSSE implementation and once
+with the OpenSSL implementation. The OpenSSL implementation can only can be
+tested if Tomcat-Native library binaries are found by the testsuite. The
+"test.apr.loc" property specifies the directory where the library binaries are
+located.
 
 By default the "test.apr.loc" property specifies the following location:
 
 output/build/bin/native/
 
-If you are on Windows and want to test the APR connector you can put the
-tcnative-1.dll file into ${tomcat.source}/bin/native/ and it will be copied
-into the above directory when the build runs.
+If you are on Windows and want to test the OpenSSL TLS implementation you can
+put the tcnative-1.dll file into ${tomcat.source}/bin/native/ and it will be
+copied into the above directory when the build runs.
 
 The unit tests include tests of the clustering functionality which require
 multicast to be enabled. There is a simple application provided in the Tomcat
diff --git a/RUNNING.txt b/RUNNING.txt
index f96d8b9..7ae9cad 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -373,10 +373,9 @@ If you do use them, do not forget to read their 
documentation.
 Apache Tomcat Native library
 -
 
-It is a library that allows to use the "Apr" variant of HTTP and AJP
-protocol connectors in Apache Tomcat. It is built around OpenSSL and Apache
-Portable Runtime (APR) libraries. Those are the same libraries as used by
-Apache HTTPD Server project.
+It is a library that allows to use the OpenSSL variant of the TLS 
implementation
+for the HTTP connector in Apache Tomcat. It is built around OpenSSL and Apache
+Portable Runtime (APR) libraries.
 
 This feature was especially important in the old days when Java performance
 was poor. It is less important nowadays, but it is still used and respected
@@ -390,13 +389,10 @@ For further reading:
 
   https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
 
-* Documentation for the HTTP and AJP protocol connectors in the Tomcat
-  Configuration Reference
+* Documentation for the HTTP connector in the Tomcat Configuration 
Reference
 
   
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
 
-  
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
-
  - Apache Tomcat Native project home
 
   https://tomcat.apache.org/native-doc/
diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index c875e67..da59f9b 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -33,3 +33,7 @@ Deferred until 10.1.x:
 the JRE with project Panama.
 
  2. Review code forked from Commons projects and consider removing unused code.
+
+ 3. Implement OCSP checks for client certs with 

[tomcat] 03/03: Update JspC to use Servlet 5.0 schemas

[markt]

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

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

commit 1235b8b98ca0443ead49048aa88a4d69392b
Author: Mark Thomas 
AuthorDate: Tue May 25 17:19:48 2021 +0100

Update JspC to use Servlet 5.0 schemas
---
 java/org/apache/jasper/resources/LocalStrings.properties | 16 
 .../apache/jasper/resources/LocalStrings_cs.properties   | 16 
 .../apache/jasper/resources/LocalStrings_de.properties   | 16 
 .../apache/jasper/resources/LocalStrings_es.properties   | 16 
 .../apache/jasper/resources/LocalStrings_fr.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ja.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ko.properties   | 16 
 .../jasper/resources/LocalStrings_pt_BR.properties   | 16 
 .../jasper/resources/LocalStrings_zh_CN.properties   | 16 
 webapps/docs/changelog.xml   |  4 
 10 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 9a73999..25673d5 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -364,11 +364,11 @@ jspc.webfrg.footer=\n\
 \n\
 \n
 jspc.webfrg.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\  version="4.0"\n\
+\  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\  
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\  version="5.0"\n\
 \  metadata-complete="true">\n\
 \  org_apache_jasper.jspc\n\
 \  \n\
@@ -392,11 +392,11 @@ jspc.webxml.footer=\n\
 \n\
 \n
 jspc.webxml.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\n\
 \ metadata-complete="false">\n\
 

[tomcat] 03/03: Update changelog

[markt]

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

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

commit b5aa51d89422035716c071cd2cc58149e27b1659
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:23:52 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4131fc2..4e0e299 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,11 @@
 before attempting conversion to String. Pull request provided by
 tianshuang. (markt)
   
+  
+62912: Don't mutate an application provided content header 
if
+it does not contain a charset. Also remove the outdated workaround for
+the buggy Adobe Reader 9 plug-in for IE. (markt)
+  
 
   
   

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

[tomcat] 03/03: Update Java versions used by Travis. Align config with 10.0.x

[markt]

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

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

commit 9eb060fbd3e1821965212386bc6c3894ed333b76
Author: Mark Thomas 
AuthorDate: Thu Apr 8 09:17:39 2021 +0100

Update Java versions used by Travis. Align config with 10.0.x
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8033348..1156345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,8 +34,8 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - mv jdk8* jdk
@@ -47,7 +47,7 @@ install:
 - ant -version
 - rm -rf $HOME/tmp
 - export CURR_PWD=`pwd`
-- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ 
$HOME/tmp/apr
+- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git 
$HOME/tmp/apr
 - cd $HOME/tmp/apr
 - ./buildconf
 - ./configure --prefix=$HOME/tmp/apr-build

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

[tomcat] 03/03: Update Java versions used by Travis. Align with 10.0.x

[markt]

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

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

commit 15e70d302fead11831ac55952e0edf25aea3af4f
Author: Mark Thomas 
AuthorDate: Thu Apr 8 09:16:29 2021 +0100

Update Java versions used by Travis. Align with 10.0.x
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8033348..1156345 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,8 +34,8 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
 - mv jdk8* jdk
@@ -47,7 +47,7 @@ install:
 - ant -version
 - rm -rf $HOME/tmp
 - export CURR_PWD=`pwd`
-- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x/ 
$HOME/tmp/apr
+- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git 
$HOME/tmp/apr
 - cd $HOME/tmp/apr
 - ./buildconf
 - ./configure --prefix=$HOME/tmp/apr-build

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

[tomcat] 03/03: Update import rules to catch issues like BZ 64805

[markt]

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

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

commit 640dea16d769617605eb47b4f5e71064c89b36e7
Author: Mark Thomas 
AuthorDate: Mon Oct 12 15:21:18 2020 +0100

Update import rules to catch issues like BZ 64805

https://bz.apache.org/bugzilla/show_bug.cgi?id=64805
---
 res/checkstyle/org-import-control.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 3a3dde0..8723aec 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -40,9 +40,9 @@
 
 
 
+
+
 
-
-
 
 
 


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

[tomcat] 03/03: Update

[markt]

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

commit 259177cf110dbc052da5e33d4f58ad2d4d535c00
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f9564d1..a594f89 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


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

[tomcat] 03/03: Update

[markt]

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

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

commit 3bd8d73acd61a20db41d02e16e46741dbcc0a2cf
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 76ecd4f..cb32064 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


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

[tomcat] 03/03: Update

[markt]

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

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

commit 3192468236f2e320ac524c90906647fcb6be3d71
Author: Mark Thomas 
AuthorDate: Tue Jul 7 10:57:47 2020 +0100

Update
---
 webapps/docs/changelog.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0bf321c..8f4fefe 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,15 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the localization of the text output of the Manager application 
+list of contexts and the Host Manager application list of hosts so that
+the output is more consistent. PR provided by Holomark. (markt)
+  
+
+  
 
 
   


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

[tomcat] 03/03: Update to Tomcat Native 1.2.24

[markt]

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

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

commit a07864fd31a3ffb871aa5c412d7cbb07ac886b7c
Author: Mark Thomas 
AuthorDate: Thu Apr 30 14:52:17 2020 +0100

Update to Tomcat Native 1.2.24
---
 build.properties.default   | 10 +-
 webapps/docs/changelog.xml |  6 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d73c8c6..928ba87 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -145,19 +145,19 @@ 
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.23
+tomcat-native.version=1.2.24
 tomcat-native.src.checksum.enabled=true
 tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
 tomcat-native.win.checksum.enabled=true
 tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
+tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
 
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1g-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
 nsis.version=3.04
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d69c248..e851a9a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,11 +208,15 @@
   
 Improve the quality of the Japanese translations provided with Apache
 Tomcat. Includes contributions from Yoshy. (markt)
+  
   
 Improve the quality of the Germasn translations provided with Apache
 Tomcat. (markt)
   
-  
+  
+Update the packaged version of the Tomcat Native Library to 1.2.24.
+(markt)
+  
 
   
 


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

[tomcat] 03/03: Update changelog

[markt]

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

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

commit a2a124ed1b161d9ad0da67ea9219473a2f06
Author: Mark Thomas 
AuthorDate: Fri Apr 3 19:23:52 2020 +0100

Update changelog
---
 webapps/docs/changelog.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dc8af5f..cb70a71 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,11 @@
 AprLifecycleListener so that the only way to use the APR
 connectors is to set the full class name. (remm)
   
+  
+62912: Don't mutate an application provided content header 
if
+it does not contain a charset. Also remove the outdated workaround for
+the buggy Adobe Reader 9 plug-in for IE. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update spec versions

[markt]

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

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

commit 319b6c8e23e034da5e2cf90a8bfb54ef70572f2f
Author: Mark Thomas 
AuthorDate: Thu Feb 6 10:05:54 2020 +

Update spec versions
---
 BUILDING.txt   |  7 ---
 RELEASE-NOTES  | 10 +-
 webapps/docs/changelog.xml |  8 
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index f8695fb..a8d31a6 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -19,9 +19,10 @@
 Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP 
Container
 
 
-This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 4.0, JSP 2.3, EL 3.0, WebSocket 1.1 and JASPIC 1.1
-specifications from the Java Community Process .
+This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
+implements the Jakarta Servlet 5.0, JSP 3.0, EL 4.0, WebSocket 2.0 and
+Authentication 2.0 specifications from the Jakarta EE project at Eclipse
+.
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
 it. You may simply download a binary distribution. It is cross-platform.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c4e88e1..ae7072f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,19 +74,19 @@ for use by web applications (by placing them in "lib"):
 * catalina-storeconfig.jar (Generation of XML configuration from current state)
 * catalina-tribes.jar (Group communication)
 * ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 3.0 API)
+* el-api.jar (EL 4.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.3 API)
-* servlet-api.jar (Servlet 4.0 API)
+* jsp-api.jar (JSP 3.0 API)
+* servlet-api.jar (Servlet 5.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
 * tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-jni.jar (Interface to the native component of the APR/native 
connector)
 * tomcat-util.jar (Various utilities)
-* tomcat-websocket.jar (WebSocket 1.1 implementation)
-* websocket-api.jar (WebSocket 1.1 API)
+* tomcat-websocket.jar (WebSocket 2.0 implementation)
+* websocket-api.jar (WebSocket 2.0 API)
 
 You can make additional APIs available to all of your web applications by
 putting unpacked classes into a "classes" directory (not created by default),
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5fd3a3b..6771063 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+Update implementated specification version information in a few places
+where it has not been updated for Jakarta EE 9. (markt)
+  
+
+  
 
 
   


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

[tomcat] 03/03: Update changelog

[markt]

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

commit caf2795d58514faa4dfa01a0f429ae693f453161
Author: Mark Thomas 
AuthorDate: Sat Nov 30 11:58:43 2019 +

Update changelog
---
 webapps/docs/changelog.xml | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9aa33be..c8e8116 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,11 +67,12 @@
 TestAsyncContextStateChanges test that caused it
 to hang indefinitely. (markt)
   
-  
-Add the ability to set and display session attributes in the JSP FORM
-authentication example to demonstrate session persistence across
-restarts for authenticated sessions. (markt)
-  
+  
+63939: Correct the same origin check in the CORS filter. An
+origin with an explicit default port is now considered to be the same 
as
+an origin without a deafult port and origins are now compared in a
+case-sensitive manner as required by the CORS specification. (markt)
+  
 
   
   
@@ -84,6 +85,15 @@
   
 
   
+  
+
+  
+Add the ability to set and display session attributes in the JSP FORM
+authentication example to demonstrate session persistence across
+restarts for authenticated sessions. (markt)
+  
+
+  
   
 
   


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

[tomcat] 03/03: Update source code links to point to Git

[markt]

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

commit d206509dabe5ea9f40aae1f0448716fd42470456
Author: Mark Thomas 
AuthorDate: Thu Aug 15 21:01:20 2019 +0100

Update source code links to point to Git
---
 build.properties.default   | 3 +++
 build.xml  | 1 +
 webapps/ROOT/index.jsp | 4 ++--
 webapps/docs/changelog.xml | 8 
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index bfe74e2..66ab7f5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -29,6 +29,9 @@ version.build=97
 version.patch=0
 version.suffix=-dev
 
+# - Source control flags -
+git.branch=7.0.x
+
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
 execute.validate=false
diff --git a/build.xml b/build.xml
index ffc0d6e..2f3c724 100644
--- a/build.xml
+++ b/build.xml
@@ -237,6 +237,7 @@
 
 
 
+
   
 
   
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 6de0008..1d3d46d 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -128,7 +128,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 
 https://tomcat.apache.org/bugreport.html;>Tomcat @VERSION_MAJOR_MINOR@ 
Bug Database
 Tomcat 
@VERSION_MAJOR_MINOR@ JavaDocs
-https://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/;>Tomcat
 @VERSION_MAJOR_MINOR@ SVN Repository
+https://github.com/apache/tomcat/tree/@GIT_BRANCH@;>Tomcat 
@VERSION_MAJOR_MINOR@ Git Repository at GitHub
 
 
 
@@ -183,7 +183,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
 Get Involved
 
 Overview
-SVN 
Repositories
+Source 
Repositories
 Mailing 
Lists
 https://wiki.apache.org/tomcat/FrontPage;>Wiki
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec80f54..56895d5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,14 @@
   
 
   
+  
+
+  
+Correct the source code links on the index page for the ROOT web
+application to point to Git rather than Subversion. (markt)
+  
+
+  
   
 
   


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

[tomcat] 03/03: Update Checkstyle to 8.22

[markt]

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

commit 21a909b779963b19282a61c8117989ab6adeca06
Author: Mark Thomas 
AuthorDate: Fri Jul 5 18:45:39 2019 +0100

Update Checkstyle to 8.22
---
 build.properties.default   | 4 ++--
 webapps/docs/changelog.xml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 92cea40..0df0638 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -281,10 +281,10 @@ 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/obj
 # Gump uses the latest checkstyle and the configuration format is incompatible
 # between the latest version and 6.1.1
 # Therefore, use checkstyle-backport-jre6
-checkstyle.version=8.17
+checkstyle.version=8.22
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=e268f16a5cab5b291546fae909e3f9b3|b626c3e518f315faf860b521807c31a03c9e2d8a
+checkstyle.checksum.value=03cb9ae24d4103134095ccd650b3bbb7|32d2996bedc97ee4e22c50e6ff5a8b571c8d816e
 checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
 
checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 94bcdbd..7792e1a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -237,6 +237,9 @@
   
 Update optional WSDL dependency to 1.6.3. (markt)
   
+  
+Update Checkstyle to version 8.22. (markt)
+  
 
   
 


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

[tomcat] 03/03: Update internal fork of Apache Commons FileUpload

[markt]

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

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

commit 05323c3d9bf8db4a7e2f7f96defab8ab3d5ef694
Author: Mark Thomas 
AuthorDate: Fri May 3 16:32:49 2019 +0100

Update internal fork of Apache Commons FileUpload
---
 MERGE.txt  | 6 +++---
 java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java| 3 ++-
 java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java | 3 +++
 java/org/apache/tomcat/util/http/fileupload/util/Streams.java  | 2 +-
 webapps/docs/changelog.xml | 4 
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 6233ac1..5687de5 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,10 +51,10 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-2cf7d09fefb17c59e5a776fd6850aebdf41046b2
+41e40479f3000dc456d27951060fda01b87fbe9a (2019-04-24)
 
-Note: Tomcat's copy of fileupload also includes classes copied manually (rather
-  than svn copied) from Commons IO.
+Note: Tomcat's copy of fileupload also includes classes copied manually from
+  Commons IO.
 
 DBCP
 
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index 07dbd51..8eb23c7 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
@@ -279,6 +279,7 @@ public abstract class FileUploadBase {
 try {
 FileItemIterator iter = getItemIterator(ctx);
 FileItemFactory fac = getFileItemFactory();
+final byte[] buffer = new byte[Streams.DEFAULT_BUFFER_SIZE];
 if (fac == null) {
 throw new NullPointerException("No FileItemFactory has been 
set.");
 }
@@ -290,7 +291,7 @@ public abstract class FileUploadBase {
item.isFormField(), 
fileName);
 items.add(fileItem);
 try {
-Streams.copy(item.openStream(), 
fileItem.getOutputStream(), true);
+Streams.copy(item.openStream(), 
fileItem.getOutputStream(), true, buffer);
 } catch (FileUploadIOException e) {
 throw (FileUploadException) e.getCause();
 } catch (IOException e) {
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java 
b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
index 87f8a8c..70ee565 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -391,6 +391,9 @@ public class DiskFileItem
  * in a temporary location so move it to the
  * desired file.
  */
+if (file.exists()) {
+file.delete();
+}
 if (!outputFile.renameTo(file)) {
 BufferedInputStream in = null;
 BufferedOutputStream out = null;
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java 
b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
index d755d7b..feeec94 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
@@ -41,7 +41,7 @@ public final class Streams {
  * Default buffer size for use in
  * {@link #copy(InputStream, OutputStream, boolean)}.
  */
-private static final int DEFAULT_BUFFER_SIZE = 8192;
+public static final int DEFAULT_BUFFER_SIZE = 8192;
 
 /**
  * Copies the contents of the given {@link InputStream}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4cc2bb1..fbe9bd5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -210,6 +210,10 @@
 When using the OneLineFormatter, don't print a blank line
 in the log after printing a stack trace. (markt)
   
+  
+Update the internal fork of Apache Commons FileUpload to pick up the
+changes since the Apache Commons FileUpload 1.4 release. (markt)
+  
 
   
 


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