date:20190503

[tomcat] branch master updated: Update merge info after remaining Commons projects migrated to git

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a10ec6e  Update merge info after remaining Commons projects migrated 
to git
a10ec6e is described below

commit a10ec6ed60d5b0f6a7e0f2d9a96b4301345dbc77
Author: Mark Thomas 
AuthorDate: Fri May 3 14:10:00 2019 +0100

Update merge info after remaining Commons projects migrated to git
---
 MERGE.txt | 34 ++
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index bd78baf..9fb1040 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -22,36 +22,30 @@ ideal. These include:
 - a large JAR where Tomcat only depends on a small fraction
 
 
-SVN
+GIT
 ===
 
-For sources hosted in svn the approach is to svn copy the classes to the Tomcat
-source tree, modify them (always with a package rename, sometimes with
-additional changes) and then keep them in sync with the original via regular 
svn
-merges. This file keeps track of these copies to assist committers in keeping
-them up to date.
+Updates from Git are applied manually via patch files. Patch files are 
generated
+using:
+git diff : HEAD: > temp.patch
+The most recently merged SHA1 for the component below should be updated after
+the patch file has been applied and committed
 
 BCEL
 
-org.apache.tomcat.util.bcel is copied from:
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
+Sub-tree:
+src/main/java/org/apache/bcel
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+0b486d19a5f923b32c25806b380b592c61176819
 
 Codec
 -
-org.apache.tomcat.util.codec is copied from:
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/
+Sub-tree:
+src/main/java/org/apache/commons/codec
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+163d643d1176e0dc9334ee83e21b9ce21d24fc1a
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
-
-GIT
-===
-
-Updates from Git are applied manually via patch files. Patch files are 
generated
-using:
-git diff : HEAD: > temp.patch
-The most recently merged SHA1 for the component below should be updated after
-the patch file has been applied and committed
-
 FileUpload
 --
 Sub-tree:


-
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

2019-05-03 Thread 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

[tomcat] 02/03: No changes to codec since last check

2019-05-03 Thread 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 c3322d05334b39f75ca5209ed7bf43e3d26fdeb7
Author: Mark Thomas 
AuthorDate: Fri May 3 16:23:55 2019 +0100

No changes to codec since last check
---
 MERGE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MERGE.txt b/MERGE.txt
index 72224c5..6233ac1 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-163d643d1176e0dc9334ee83e21b9ce21d24fc1a
+8502e2f14a6eafb0afa0964b34d1d1bb02b44f64 (2019-04-23)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload


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

[tomcat] branch master updated (a10ec6e -> 05323c3)

2019-05-03 Thread markt

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

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


from a10ec6e  Update merge info after remaining Commons projects migrated 
to git
 new 56f23b0  No relevant changes to BCEl since last check
 new c3322d0  No changes to codec since last check
 new 05323c3  Update internal fork of Apache Commons FileUpload

The 3 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:
 MERGE.txt  | 10 +-
 .../org/apache/tomcat/util/http/fileupload/FileUploadBase.java |  3 ++-
 .../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, 15 insertions(+), 7 deletions(-)


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

[tomcat] 01/03: No relevant changes to BCEl since last check

2019-05-03 Thread 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 56f23b0959e95709becb811379f0f577b6522564
Author: Mark Thomas 
AuthorDate: Fri May 3 16:19:11 2019 +0100

No relevant changes to BCEl since last check
---
 MERGE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MERGE.txt b/MERGE.txt
index 9fb1040..72224c5 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-0b486d19a5f923b32c25806b380b592c61176819
+33b9f8718ac00b2cbbcc3bf498e55872a3066f19 (2019-04-27)
 
 Codec
 -


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

[tomcat] branch master updated: Update internal form of Apache Commons DBCP

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new dacb2b6  Update internal form of Apache Commons DBCP
dacb2b6 is described below

commit dacb2b6ef15d862b2d034732d3d779a577c2c537
Author: Mark Thomas 
AuthorDate: Fri May 3 16:46:30 2019 +0100

Update internal form of Apache Commons DBCP
---
 MERGE.txt|  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java   |  9 +
 java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java |  9 +
 java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java |  2 +-
 .../apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java  |  4 +++-
 webapps/docs/changelog.xml   | 12 
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 5687de5..e28ca94 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -63,7 +63,7 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-de20b7779214cf8b0056aa61bb6d56c94ed3afb7
+dcdbc72acf51155d2a6c3f10461d9712a3623686 (2019-04-24)
 
 Pool2
 Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index bf008d8..37f036d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -418,12 +418,12 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 registeredJmxObjectName = null;
 }
 closed = true;
-final GenericObjectPool oldpool = connectionPool;
+final GenericObjectPool oldPool = connectionPool;
 connectionPool = null;
 dataSource = null;
 try {
-if (oldpool != null) {
-oldpool.close();
+if (oldPool != null) {
+oldPool.close();
 }
 } catch (final RuntimeException e) {
 throw e;
@@ -1506,7 +1506,8 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 /**
  * Manually evicts idle connections.
  *
- * @throws Exception when there is a problem evicting idle objects.
+ * @throws Exception Thrown by {@link GenericObjectPool#evict()}.
+ * @see GenericObjectPool#evict()
  */
 public void evict() throws Exception {
 if (connectionPool != null) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java 
b/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
index f036989..9c78936 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
@@ -18,6 +18,7 @@
 package org.apache.tomcat.dbcp.dbcp2;
 
 import java.lang.management.ManagementFactory;
+import java.util.Objects;
 
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
@@ -76,6 +77,14 @@ class ObjectNameWrapper {
 }
 }
 
+/**
+ * @since 2.7.0
+ */
+@Override
+public String toString() {
+return Objects.toString(objectName);
+}
+
 public void unregisterMBean() {
 if (MBEAN_SERVER == null || objectName == null) {
 return;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
index 70601b0..38a0472 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
@@ -75,7 +75,7 @@ public class PoolingDataSource 
implements DataSource, Auto
  * @since 2.1
  */
 @Override
-public void close() throws Exception {
+public void close() throws RuntimeException, SQLException {
 try {
 pool.close();
 } catch (final RuntimeException rte) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
index 50c825b..74ae7cf 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
@@ -65,8 +65,10 @@ public class ManagedDataSource extends 
PoolingDataSourceOneLineFormatter, 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)
-  
+  
+Update the internal fork of Apache Commons FileUpload to 41e4047
+(2019-04-24) pick up some enhancements. (markt)
+  
+  
+Update the interna

[tomcat] branch master updated: Update internal fork of Apache Commons Pool 2

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d676a1e  Update internal fork of Apache Commons Pool 2
d676a1e is described below

commit d676a1eb64c3d3c93abe90daa3226bfa448f68ec
Author: Mark Thomas 
AuthorDate: Fri May 3 16:57:22 2019 +0100

Update internal fork of Apache Commons Pool 2
---
 MERGE.txt  |  2 +-
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   | 47 +-
 .../dbcp/pool2/impl/BaseGenericObjectPool.java |  8 ++--
 .../tomcat/dbcp/pool2/impl/CallStackUtils.java |  8 +---
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  | 35 +---
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 25 +++-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 26 
 webapps/docs/changelog.xml |  6 ++-
 8 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index e28ca94..7d24a98 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-d4e0e88227ad91d8c8ef36ba01d656f71c770f83
+0664f4dac9ef653703624cbe67272134cf0151cb (2019-04-30)
diff --git a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java 
b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
index 4fb0aba..2494351 100644
--- a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
+++ b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
@@ -36,6 +36,13 @@ import 
java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
  */
 public final class PoolUtils {
 
+private static final String MSG_FACTOR_NEGATIVE = "factor must be 
positive.";
+private static final String MSG_MIN_IDLE = "minIdle must be non-negative.";
+private static final String MSG_NULL_KEY = "key must not be null.";
+private static final String MSG_NULL_KEYED_POOL = "keyedPool must not be 
null.";
+private static final String MSG_NULL_KEYS = "keys must not be null.";
+private static final String MSG_NULL_POOL = "pool must not be null.";
+
 /**
  * Timer used to periodically check pools idle object count. Because a
  * {@link Timer} creates a {@link Thread}, an IODH is used.
@@ -101,10 +108,10 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (pool == null) {
-throw new IllegalArgumentException("keyedPool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYED_POOL);
 }
 if (minIdle < 0) {
-throw new IllegalArgumentException("minIdle must be 
non-negative.");
+throw new IllegalArgumentException(MSG_MIN_IDLE);
 }
 final TimerTask task = new ObjectPoolMinIdleTimerTask<>(pool, minIdle);
 getMinIdleTimer().schedule(task, 0L, period);
@@ -142,13 +149,13 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (keyedPool == null) {
-throw new IllegalArgumentException("keyedPool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYED_POOL);
 }
 if (key == null) {
-throw new IllegalArgumentException("key must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEY);
 }
 if (minIdle < 0) {
-throw new IllegalArgumentException("minIdle must be 
non-negative.");
+throw new IllegalArgumentException(MSG_MIN_IDLE);
 }
 final TimerTask task = new KeyedObjectPoolMinIdleTimerTask<>(
 keyedPool, key, minIdle);
@@ -188,7 +195,7 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (keys == null) {
-throw new IllegalArgumentException("keys must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYS);
 }
 final Map tasks = new HashMap<>(keys.size());
 final Iterator iter = keys.iterator();
@@ -217,7 +224,7 @@ public final class PoolUtils {
 public static  void prefill(final ObjectPool pool, final int count)
 throws Exception, IllegalArgumentException {
 if (pool == null) {
-throw new IllegalArgumentException("pool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_POOL);
 }
 for (int i = 0; i < count; i++) {
 pool.addObject();
@@ -246,10 +253,10 @@ public final class PoolUtils {
 final K key, final int count) throws Exception,
 IllegalArgumentException {
 if (keyedPool == null) {
-throw new Illeg

[tomcat] 01/02: ws police

2019-05-03 Thread 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 154cf8f439ec985650cf15f5d2050bda6ed12f6a
Author: Mark Thomas 
AuthorDate: Fri May 3 17:22:03 2019 +0100

ws police
---
 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 e75f345..8518b64 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -215,7 +215,7 @@
 (2019-04-24) pick up some enhancements. (markt)
   
   
-Update the internal fork of Apache Commons DBCP 2 to dcdbc72 
+Update the internal fork of Apache Commons DBCP 2 to dcdbc72
 (2019-04-24) to pick up some clean-up and enhancements. (markt)
   
   


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

[tomcat] 02/02: Review diff to Commons FileUpload. Format changes to reduce diff.

2019-05-03 Thread 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 c33732159e28d073d456e1f832013ffd8702cd41
Author: Mark Thomas 
AuthorDate: Fri May 3 17:22:43 2019 +0100

Review diff to Commons FileUpload. Format changes to reduce diff.
---
 .../org/apache/tomcat/util/http/fileupload/FileUploadBase.java |  5 ++---
 .../apache/tomcat/util/http/fileupload/ParameterParser.java| 10 +-
 .../apache/tomcat/util/http/fileupload/disk/DiskFileItem.java  |  5 ++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index 8eb23c7..486434a 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
@@ -404,8 +404,7 @@ public abstract class FileUploadBase {
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params =
-parser.parse(pContentDisposition, ';');
+Map params = parser.parse(pContentDisposition, 
';');
 if (params.containsKey("filename")) {
 fileName = params.get("filename");
 if (fileName != null) {
@@ -447,7 +446,7 @@ public abstract class FileUploadBase {
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params = parser.parse(pContentDisposition, ';');
+Map params = parser.parse(pContentDisposition, 
';');
 fieldName = params.get("name");
 if (fieldName != null) {
 fieldName = fieldName.trim();
diff --git a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java 
b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
index e0ccd91..061be67 100644
--- a/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
+++ b/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
@@ -226,7 +226,7 @@ public class ParameterParser {
  *
  * @return a map of name/value pairs
  */
-public Map parse(final String str, char[] separators) {
+public Map parse(final String str, char[] separators) {
 if (separators == null || separators.length == 0) {
 return new HashMap<>();
 }
@@ -253,7 +253,7 @@ public class ParameterParser {
  *
  * @return a map of name/value pairs
  */
-public Map parse(final String str, char separator) {
+public Map parse(final String str, char separator) {
 if (str == null) {
 return new HashMap<>();
 }
@@ -270,7 +270,7 @@ public class ParameterParser {
  *
  * @return a map of name/value pairs
  */
-public Map parse(final char[] charArray, char separator) {
+public Map parse(final char[] charArray, char separator) {
 if (charArray == null) {
 return new HashMap<>();
 }
@@ -289,7 +289,7 @@ public class ParameterParser {
  *
  * @return a map of name/value pairs
  */
-public Map parse(
+public Map parse(
 final char[] charArray,
 int offset,
 int length,
@@ -298,7 +298,7 @@ public class ParameterParser {
 if (charArray == null) {
 return new HashMap<>();
 }
-HashMap params = new HashMap<>();
+HashMap params = new HashMap<>();
 this.chars = charArray;
 this.pos = offset;
 this.len = length;
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 70ee565..38c783e 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -223,7 +223,7 @@ public class DiskFileItem
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params = parser.parse(getContentType(), ';');
+Map params = parser.parse(getContentType(), ';');
 return params.get("charset");
 }
 
@@ -572,8 +572,7 @@ public class DiskFileItem
 tempDir = new File(System.getProperty("java.io.tmpdir"));
 }
 
-String tempFileName =
-String.format("upload_%s_%s.tmp", UID, getUniqueId());
+String tempFileName = String.format("upload_%s_%s.tmp", UID, 
getUniqueId());
 
 tempFile = new File(tempDir, tempFileName);
 }


-
To unsubscribe, e-mail: d

[tomcat] branch master updated (d676a1e -> c337321)

2019-05-03 Thread markt

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

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


from d676a1e  Update internal fork of Apache Commons Pool 2
 new 154cf8f  ws police
 new c337321  Review diff to Commons FileUpload. Format changes to reduce 
diff.

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:
 .../org/apache/tomcat/util/http/fileupload/FileUploadBase.java |  5 ++---
 .../apache/tomcat/util/http/fileupload/ParameterParser.java| 10 +-
 .../apache/tomcat/util/http/fileupload/disk/DiskFileItem.java  |  5 ++---
 webapps/docs/changelog.xml |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)


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

buildbot failure in on tomcat-trunk

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[tomcat] branch master updated: Reduce diff to Commons DBCP 2 to aid future maintenance

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 95c74cb  Reduce diff to Commons DBCP 2 to aid future maintenance
95c74cb is described below

commit 95c74cbc4f304b8bd02cecae41625b7be4db7a7f
Author: Mark Thomas 
AuthorDate: Fri May 3 17:39:56 2019 +0100

Reduce diff to Commons DBCP 2 to aid future maintenance
---
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  | 30 +++---
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 15 +--
 .../dbcp/dbcp2/managed/BasicManagedDataSource.java |  2 +-
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 37f036d..ba3e38a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -750,6 +750,21 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 }
 
 /**
+ * If the connection pool implements {@link 
org.apache.tomcat.dbcp.pool2.UsageTracking UsageTracking}, should the
+ * connection pool record a stack trace every time a method is called on a 
pooled connection and retain the most
+ * recent stack trace to aid debugging of abandoned connections?
+ *
+ * @return true if usage tracking is enabled
+ */
+@Override
+public boolean getAbandonedUsageTracking() {
+if (abandonedConfig != null) {
+return abandonedConfig.getUseUsageTracking();
+}
+return false;
+}
+
+/**
  * Returns the value of the flag that controls whether or not connections 
being returned to the pool will be checked
  * and configured with {@link Connection#setAutoCommit(boolean) 
Connection.setAutoCommit(true)} if the auto commit
  * setting is {@code false} when the connection is returned. It is 
true by default.
@@ -1633,21 +1648,6 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 }
 
 /**
- * If the connection pool implements {@link 
org.apache.tomcat.dbcp.pool2.UsageTracking UsageTracking}, should the
- * connection pool record a stack trace every time a method is called on a 
pooled connection and retain the most
- * recent stack trace to aid debugging of abandoned connections?
- *
- * @return true if usage tracking is enabled
- */
-@Override
-public boolean getAbandonedUsageTracking() {
-if (abandonedConfig != null) {
-return abandonedConfig.getUseUsageTracking();
-}
-return false;
-}
-
-/**
  * If the connection pool implements {@link 
org.apache.tomcat.dbcp.pool2.UsageTracking UsageTracking}, configure whether
  * the connection pool should record a stack trace every time a method is 
called on a pooled connection and retain
  * the most recent stack trace to aid debugging of abandoned connections.
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java 
b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
index 99e92bd..b4ee5b9 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
  * 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.
@@ -7,13 +6,13 @@
  * (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
+ *  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.
+ * 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.dbcp.dbcp2;
 
diff --git 
a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
index 8d021e3..654edc2 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
@@ -52,7 +52,7 @@ import org.apache.t

[tomcat] branch master updated: Reduce diff to Commons Pool 2 to reduce future maintenance

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new cda676c  Reduce diff to Commons Pool 2 to reduce future maintenance
cda676c is described below

commit cda676cd07e4a9c702485b4e756c1d74dd6d188f
Author: Mark Thomas 
AuthorDate: Fri May 3 17:57:04 2019 +0100

Reduce diff to Commons Pool 2 to reduce future maintenance
---
 java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
index 7de46a3..175631c 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
@@ -1147,7 +1147,6 @@ public class GenericKeyedObjectPool extends 
BaseGenericObjectPool
 private void deregister(final K k) {
 Lock lock = keyLock.readLock();
 ObjectDeque objectDeque;
-
 try {
 lock.lock();
 objectDeque = poolMap.get(k);


-
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

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] c33732159e28d073d456e1f832013ffd8702cd41
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 master updated (cda676c -> 151b447)

2019-05-03 Thread markt

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

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


from cda676c  Reduce diff to Commons Pool 2 to reduce future maintenance
 new 5c026aa  Fix SpotBugs false positive
 new 151b447  Fix SpotBugs warning

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/tomcat/util/http/fileupload/disk/DiskFileItem.java | 5 -
 res/findbugs/filter-false-positives.xml| 7 +++
 2 files changed, 11 insertions(+), 1 deletion(-)


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

[tomcat] 02/02: Fix SpotBugs warning

2019-05-03 Thread 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 151b4472f3b2ea7a7ea820dee6d4c617d3864a2a
Author: Mark Thomas 
AuthorDate: Fri May 3 18:41:30 2019 +0100

Fix SpotBugs warning
---
 java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

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 38c783e..3992162 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -392,7 +392,10 @@ public class DiskFileItem
  * desired file.
  */
 if (file.exists()) {
-file.delete();
+if (!file.delete()) {
+throw new FileUploadException(
+"Cannot write uploaded file to disk!");
+}
 }
 if (!outputFile.renameTo(file)) {
 BufferedInputStream in = null;


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

[tomcat] 01/02: Fix SpotBugs false positive

2019-05-03 Thread 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 5c026aad80ed73b32e9aa230429c948d0928e9a4
Author: Mark Thomas 
AuthorDate: Fri May 3 18:40:28 2019 +0100

Fix SpotBugs false positive
---
 res/findbugs/filter-false-positives.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/res/findbugs/filter-false-positives.xml 
b/res/findbugs/filter-false-positives.xml
index 30ee367..c7239f2 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -961,6 +961,13 @@
 
   
   
+
+
+
+
+  
+  
 
 
 


-
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 (91217ef -> 9c27bd1)

2019-05-03 Thread markt

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

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


from 91217ef  Place data holder rather than CrawlerSessionManagerValve in 
session
 new f9efa75  Align fork of Commons DBCP 2 with the 9.0.x copy excluding 
JDBC 4.2
 new 9c27bd1  Align fork of Commons Pool 2 with the 9.0.x copy

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:
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  | 3388 ++--
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  224 +-
 .../dbcp/dbcp2/DataSourceConnectionFactory.java|   26 +-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|   12 +-
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |6 +-
 .../dbcp/dbcp2/DelegatingPreparedStatement.java|2 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |8 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |6 +-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |   24 +
 .../dbcp/dbcp2/DriverManagerConnectionFactory.java |   62 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |  482 +++
 .../tomcat/dbcp/dbcp2/LocalStrings.properties  |6 +-
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |9 +
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |   16 +
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  680 ++--
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |2 +-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |   68 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  |   45 +
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|3 +-
 .../dbcp2/datasources/CPDSConnectionFactory.java   |   26 +
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   75 +
 .../dbcp2/datasources/SharedPoolDataSource.java|7 +
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |7 +-
 java/org/apache/tomcat/dbcp/dbcp2/overview.html|   26 -
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   |   47 +-
 .../dbcp/pool2/impl/BaseGenericObjectPool.java |8 +-
 .../tomcat/dbcp/pool2/impl/CallStackUtils.java |8 +-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |   35 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java|   26 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  |   26 +
 java/org/apache/tomcat/dbcp/pool2/overview.html|   49 -
 webapps/docs/changelog.xml |9 +
 33 files changed, 3150 insertions(+), 2270 deletions(-)
 create mode 100644 java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java
 delete mode 100644 java/org/apache/tomcat/dbcp/dbcp2/overview.html
 delete mode 100644 java/org/apache/tomcat/dbcp/pool2/overview.html


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

[tomcat] 02/02: Align fork of Commons Pool 2 with the 9.0.x copy

2019-05-03 Thread 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 9c27bd13600fa2f6c40bcb6d5ff4ca0f5ca8cafd
Author: Mark Thomas 
AuthorDate: Fri May 3 19:40:24 2019 +0100

Align fork of Commons Pool 2 with the 9.0.x copy
---
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   | 47 -
 .../dbcp/pool2/impl/BaseGenericObjectPool.java |  8 ++--
 .../tomcat/dbcp/pool2/impl/CallStackUtils.java |  8 +---
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  | 35 +---
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 26 ++--
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 26 
 java/org/apache/tomcat/dbcp/pool2/overview.html| 49 --
 webapps/docs/changelog.xml |  4 ++
 8 files changed, 95 insertions(+), 108 deletions(-)

diff --git a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java 
b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
index 4fb0aba..2494351 100644
--- a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
+++ b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
@@ -36,6 +36,13 @@ import 
java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
  */
 public final class PoolUtils {
 
+private static final String MSG_FACTOR_NEGATIVE = "factor must be 
positive.";
+private static final String MSG_MIN_IDLE = "minIdle must be non-negative.";
+private static final String MSG_NULL_KEY = "key must not be null.";
+private static final String MSG_NULL_KEYED_POOL = "keyedPool must not be 
null.";
+private static final String MSG_NULL_KEYS = "keys must not be null.";
+private static final String MSG_NULL_POOL = "pool must not be null.";
+
 /**
  * Timer used to periodically check pools idle object count. Because a
  * {@link Timer} creates a {@link Thread}, an IODH is used.
@@ -101,10 +108,10 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (pool == null) {
-throw new IllegalArgumentException("keyedPool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYED_POOL);
 }
 if (minIdle < 0) {
-throw new IllegalArgumentException("minIdle must be 
non-negative.");
+throw new IllegalArgumentException(MSG_MIN_IDLE);
 }
 final TimerTask task = new ObjectPoolMinIdleTimerTask<>(pool, minIdle);
 getMinIdleTimer().schedule(task, 0L, period);
@@ -142,13 +149,13 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (keyedPool == null) {
-throw new IllegalArgumentException("keyedPool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYED_POOL);
 }
 if (key == null) {
-throw new IllegalArgumentException("key must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEY);
 }
 if (minIdle < 0) {
-throw new IllegalArgumentException("minIdle must be 
non-negative.");
+throw new IllegalArgumentException(MSG_MIN_IDLE);
 }
 final TimerTask task = new KeyedObjectPoolMinIdleTimerTask<>(
 keyedPool, key, minIdle);
@@ -188,7 +195,7 @@ public final class PoolUtils {
 final int minIdle, final long period)
 throws IllegalArgumentException {
 if (keys == null) {
-throw new IllegalArgumentException("keys must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYS);
 }
 final Map tasks = new HashMap<>(keys.size());
 final Iterator iter = keys.iterator();
@@ -217,7 +224,7 @@ public final class PoolUtils {
 public static  void prefill(final ObjectPool pool, final int count)
 throws Exception, IllegalArgumentException {
 if (pool == null) {
-throw new IllegalArgumentException("pool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_POOL);
 }
 for (int i = 0; i < count; i++) {
 pool.addObject();
@@ -246,10 +253,10 @@ public final class PoolUtils {
 final K key, final int count) throws Exception,
 IllegalArgumentException {
 if (keyedPool == null) {
-throw new IllegalArgumentException("keyedPool must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEYED_POOL);
 }
 if (key == null) {
-throw new IllegalArgumentException("key must not be null.");
+throw new IllegalArgumentException(MSG_NULL_KEY);
 }
 for (int i = 0; i < count; i++) {
 keyedPool.addObject(key);
@@ -281,7 +288,7 @@ public final class PoolUtils {
 final Collection keys,

[tomcat] 01/02: Backport i18n changes from 9.0.x to keep code aligned

2019-05-03 Thread 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 67de585ef74a09269848f878443e4910c7e8d83f
Author: Mark Thomas 
AuthorDate: Fri May 3 19:55:39 2019 +0100

Backport i18n changes from 9.0.x to keep code aligned
---
 java/org/apache/tomcat/util/codec/binary/Base64.java  | 16 
 .../apache/tomcat/util/codec/binary/BaseNCodec.java   |  3 +++
 .../tomcat/util/codec/binary/LocalStrings.properties  | 19 +++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 27fd701..ed13cb5 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -278,7 +278,7 @@ public class Base64 extends BaseNCodec {
 if (lineSeparator != null) {
 if (containsAlphabetOrPad(lineSeparator)) {
 final String sep = StringUtils.newStringUtf8(lineSeparator);
-throw new IllegalArgumentException("lineSeparator must not 
contain base64 characters: [" + sep + "]");
+throw new 
IllegalArgumentException(sm.getString("base64.lineSeparator", sep));
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
@@ -366,7 +366,8 @@ public class Base64 extends BaseNCodec {
 }
 break;
 default:
-throw new IllegalStateException("Impossible modulus 
"+context.modulus);
+throw new IllegalStateException(sm.getString(
+"base64.impossibleModulus", 
Integer.valueOf(context.modulus)));
 }
 context.currentLinePos += context.pos - savedPos; // keep track of 
current line position
 // if currentPos == 0 we are at the start of a line, so don't add 
CRLF
@@ -477,7 +478,8 @@ public class Base64 extends BaseNCodec {
 buffer[context.pos++] = (byte) ((context.ibitWorkArea) & 
MASK_8BITS);
 break;
 default:
-throw new IllegalStateException("Impossible modulus 
"+context.modulus);
+throw new IllegalStateException(sm.getString(
+"base64.impossibleModulus", 
Integer.valueOf(context.modulus)));
 }
 }
 }
@@ -652,10 +654,8 @@ public class Base64 extends BaseNCodec {
 final Base64 b64 = isChunked ? new Base64(urlSafe) : new Base64(0, 
CHUNK_SEPARATOR, urlSafe);
 final long len = b64.getEncodedLength(binaryData);
 if (len > maxResultSize) {
-throw new IllegalArgumentException("Input array too big, the 
output array would be bigger (" +
-len +
-") than the specified maximum size of " +
-maxResultSize);
+throw new IllegalArgumentException(sm.getString(
+"base64.inputTooLarge", Long.valueOf(len), 
Integer.valueOf(maxResultSize)));
 }
 
 return b64.encode(binaryData);
@@ -722,7 +722,7 @@ public class Base64 extends BaseNCodec {
  */
 public static byte[] encodeInteger(final BigInteger bigInt) {
 if (bigInt == null) {
-throw new NullPointerException("encodeInteger called with null 
parameter");
+throw new 
NullPointerException(sm.getString("base64.nullEncodeParameter"));
 }
 return encodeBase64(toIntegerBytes(bigInt), false);
 }
diff --git a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java 
b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
index b2a9db7..4dbe84a 100644
--- a/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
+++ b/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
@@ -21,6 +21,7 @@ import org.apache.tomcat.util.codec.BinaryDecoder;
 import org.apache.tomcat.util.codec.BinaryEncoder;
 import org.apache.tomcat.util.codec.DecoderException;
 import org.apache.tomcat.util.codec.EncoderException;
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Abstract superclass for Base-N encoders and decoders.
@@ -32,6 +33,8 @@ import org.apache.tomcat.util.codec.EncoderException;
 @SuppressWarnings("deprecation")
 public abstract class BaseNCodec implements BinaryEncoder, BinaryDecoder {
 
+protected static final StringManager sm = 
StringManager.getManager(BaseNCodec.class);
+
 /**
  * Holds thread context so classes can be thread-safe.
  *
diff --git a/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties 
b/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
new file mode 100644
index 000..1ae86a3
--- /dev/null
+++ b/java/org/apache/tomcat/util/codec/binary/LocalStrin

[tomcat] 02/02: Align fork of Commons FileUpload with the 9.0.x copy

2019-05-03 Thread 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 5b9399df512f5340bdf29573200aaa3eacbb0f8a
Author: Mark Thomas 
AuthorDate: Fri May 3 19:59:50 2019 +0100

Align fork of Commons FileUpload with the 9.0.x copy
---
 .../util/http/fileupload/FileUploadBase.java   | 27 --
 .../tomcat/util/http/fileupload/IOUtils.java   | 16 ++---
 .../util/http/fileupload/ParameterParser.java  | 10 
 .../util/http/fileupload/disk/DiskFileItem.java| 11 ++---
 .../tomcat/util/http/fileupload/util/Streams.java  |  2 +-
 .../http/fileupload/util/mime/MimeUtility.java |  2 +-
 webapps/docs/changelog.xml |  4 
 7 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java 
b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index eb5a487..486434a 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) {
@@ -403,8 +404,7 @@ public abstract class FileUploadBase {
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params =
-parser.parse(pContentDisposition, ';');
+Map params = parser.parse(pContentDisposition, 
';');
 if (params.containsKey("filename")) {
 fileName = params.get("filename");
 if (fileName != null) {
@@ -446,7 +446,7 @@ public abstract class FileUploadBase {
 ParameterParser parser = new ParameterParser();
 parser.setLowerCaseNames(true);
 // Parameter parser can handle null input
-Map params = parser.parse(pContentDisposition, ';');
+Map params = parser.parse(pContentDisposition, 
';');
 fieldName = params.get("name");
 if (fieldName != null) {
 fieldName = fieldName.trim();
@@ -606,20 +606,23 @@ public abstract class FileUploadBase {
 fieldName = pFieldName;
 contentType = pContentType;
 formField = pFormField;
-final ItemInputStream itemStream = multi.newInputStream();
-InputStream istream = itemStream;
-if (fileSizeMax != -1) {
+if (fileSizeMax != -1) { // Check if limit is already exceeded
 if (pContentLength != -1
-&&  pContentLength > fileSizeMax) {
+&& pContentLength > fileSizeMax) {
 FileSizeLimitExceededException e =
-new FileSizeLimitExceededException(
-String.format("The field %s exceeds its 
maximum permitted size of %s bytes.",
-fieldName, Long.valueOf(fileSizeMax)),
-pContentLength, fileSizeMax);
+new FileSizeLimitExceededException(
+String.format("The field %s exceeds 
its maximum permitted size of %s bytes.",
+   fieldName, 
Long.valueOf(fileSizeMax)),
+pContentLength, fileSizeMax);
 e.setFileName(pName);
 e.setFieldName(pFieldName);
 throw new FileUploadIOException(e);
 }
+}
+// OK to construct stream now
+final ItemInputStream itemStream = multi.newInputStream();
+InputStream istream = itemStream;
+if (fileSizeMax != -1) {
 istream = new LimitedInputStream(istream, fileSizeMax) {

[tomcat] branch 8.5.x updated (9c27bd1 -> 5b9399d)

2019-05-03 Thread markt

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

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


from 9c27bd1  Align fork of Commons Pool 2 with the 9.0.x copy
 new 67de585  Backport i18n changes from 9.0.x to keep code aligned
 new 5b9399d  Align fork of Commons FileUpload with the 9.0.x copy

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:
 .../apache/tomcat/util/codec/binary/Base64.java| 16 ++---
 .../tomcat/util/codec/binary/BaseNCodec.java   |  3 +++
 .../util/codec/binary}/LocalStrings.properties |  6 +++--
 .../util/http/fileupload/FileUploadBase.java   | 27 --
 .../tomcat/util/http/fileupload/IOUtils.java   | 16 ++---
 .../util/http/fileupload/ParameterParser.java  | 10 
 .../util/http/fileupload/disk/DiskFileItem.java| 11 ++---
 .../tomcat/util/http/fileupload/util/Streams.java  |  2 +-
 .../http/fileupload/util/mime/MimeUtility.java |  2 +-
 webapps/docs/changelog.xml |  4 
 10 files changed, 56 insertions(+), 41 deletions(-)
 copy java/org/apache/{catalina/ha/authenticator => 
tomcat/util/codec/binary}/LocalStrings.properties (70%)


-
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: Expand HTTP/2 timeout handling to connection window exhaustion on write.

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 0bcd69c  Expand HTTP/2 timeout handling to connection window 
exhaustion on write.
0bcd69c is described below

commit 0bcd69c9dd8ae0ff424f2cd46de51583510b7f35
Author: Mark Thomas 
AuthorDate: Tue Apr 30 22:18:12 2019 +0100

Expand HTTP/2 timeout handling to connection window exhaustion on write.
---
 .../apache/coyote/http2/Http2UpgradeHandler.java   | 32 --
 java/org/apache/coyote/http2/Stream.java   | 27 ++
 webapps/docs/changelog.xml |  4 +++
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 86f0e93..e5ae91f 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -805,7 +805,26 @@ public class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpU
 if (allocation == 0) {
 if (block) {
 try {
-stream.wait();
+// Connection level window is empty. Although this
+// request is for a stream, use the connection
+// timeout
+long writeTimeout = protocol.getWriteTimeout();
+if (writeTimeout < 0) {
+stream.wait();
+} else {
+stream.wait(writeTimeout);
+}
+// Has this stream been granted an allocation
+int[] value = backLogStreams.get(stream);
+if (value[1] == 0) {
+// No allocation
+// Close the connection. Do this first since
+// closing the stream will raise an exception
+close();
+// Close the stream (in app code so need to
+// signal to app stream is closing)
+stream.doWriteTimeout();
+}
 } catch (InterruptedException e) {
 throw new IOException(sm.getString(
 
"upgradeHandler.windowSizeReservationInterrupted", connectionId,
@@ -1023,11 +1042,20 @@ public class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpU
 
 
 private void close() {
-connectionState.set(ConnectionState.CLOSED);
+ConnectionState previous = 
connectionState.getAndSet(ConnectionState.CLOSED);
+if (previous == ConnectionState.CLOSED) {
+// Already closed
+return;
+}
+
 for (Stream stream : streams.values()) {
 // The connection is closing. Close the associated streams as no
 // longer required.
 stream.receiveReset(Http2Error.CANCEL.getCode());
+// Release any streams waiting for an allocation
+synchronized (stream) {
+stream.notifyAll();
+}
 }
 try {
 socketWrapper.close();
diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 1c6ed9d..d7b2006 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -280,17 +280,7 @@ public class Stream extends AbstractStream implements 
HeaderEmitter {
 }
 windowSize = getWindowSize();
 if (windowSize == 0) {
-String msg = sm.getString("stream.writeTimeout");
-StreamException se = new StreamException(
-msg, Http2Error.ENHANCE_YOUR_CALM, 
getIdAsInt());
-// Prevent the application making further writes
-streamOutputBuffer.closed = true;
-// Prevent Tomcat's error handling trying to write
-coyoteResponse.setError();
-coyoteResponse.setErrorReported();
-// Trigger a reset once control returns to Tomcat
-streamOutputBuffer.reset = se;
-throw new CloseNowException(msg, se);
+doWriteTimeout();
 }
 } catch (InterruptedException e) {
 // Possible shutdown / rst or similar. Use an IOException 
to
@@ -313,6 +303,21 @@ public clas

[tomcat] branch master updated: Expand HTTP/2 timeout handling to connection window exhaustion on write.

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 7f748eb  Expand HTTP/2 timeout handling to connection window 
exhaustion on write.
7f748eb is described below

commit 7f748eb6bfaba5207c89dbd7d5adf50fae847145
Author: Mark Thomas 
AuthorDate: Tue Apr 30 22:18:12 2019 +0100

Expand HTTP/2 timeout handling to connection window exhaustion on write.
---
 .../apache/coyote/http2/Http2UpgradeHandler.java   | 32 --
 java/org/apache/coyote/http2/Stream.java   | 27 ++
 webapps/docs/changelog.xml |  4 +++
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index a787349..58620fd 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -801,7 +801,26 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 if (allocation == 0) {
 if (block) {
 try {
-stream.wait();
+// Connection level window is empty. Although this
+// request is for a stream, use the connection
+// timeout
+long writeTimeout = protocol.getWriteTimeout();
+if (writeTimeout < 0) {
+stream.wait();
+} else {
+stream.wait(writeTimeout);
+}
+// Has this stream been granted an allocation
+int[] value = backLogStreams.get(stream);
+if (value[1] == 0) {
+// No allocation
+// Close the connection. Do this first since
+// closing the stream will raise an exception
+close();
+// Close the stream (in app code so need to
+// signal to app stream is closing)
+stream.doWriteTimeout();
+}
 } catch (InterruptedException e) {
 throw new IOException(sm.getString(
 
"upgradeHandler.windowSizeReservationInterrupted", connectionId,
@@ -1024,11 +1043,20 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 
 
 private void close() {
-connectionState.set(ConnectionState.CLOSED);
+ConnectionState previous = 
connectionState.getAndSet(ConnectionState.CLOSED);
+if (previous == ConnectionState.CLOSED) {
+// Already closed
+return;
+}
+
 for (Stream stream : streams.values()) {
 // The connection is closing. Close the associated streams as no
 // longer required.
 stream.receiveReset(Http2Error.CANCEL.getCode());
+// Release any streams waiting for an allocation
+synchronized (stream) {
+stream.notifyAll();
+}
 }
 try {
 socketWrapper.close();
diff --git a/java/org/apache/coyote/http2/Stream.java 
b/java/org/apache/coyote/http2/Stream.java
index 408a144..3f36c56 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -283,17 +283,7 @@ class Stream extends AbstractStream implements 
HeaderEmitter {
 }
 windowSize = getWindowSize();
 if (windowSize == 0) {
-String msg = sm.getString("stream.writeTimeout");
-StreamException se = new StreamException(
-msg, Http2Error.ENHANCE_YOUR_CALM, 
getIdAsInt());
-// Prevent the application making further writes
-streamOutputBuffer.closed = true;
-// Prevent Tomcat's error handling trying to write
-coyoteResponse.setError();
-coyoteResponse.setErrorReported();
-// Trigger a reset once control returns to Tomcat
-streamOutputBuffer.reset = se;
-throw new CloseNowException(msg, se);
+doWriteTimeout();
 }
 } catch (InterruptedException e) {
 // Possible shutdown / rst or similar. Use an IOException 
to
@@ -316,6 +306,21 @@ class Stream ext

buildbot failure in on tomcat-85-trunk

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 0bcd69c9dd8ae0ff424f2cd46de51583510b7f35
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-trunk

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 7f748eb6bfaba5207c89dbd7d5adf50fae847145
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

Re: [tomcat] branch master updated (a10ec6e -> 05323c3)

2019-05-03 Thread Rainer Jung

I think this is the first summary message I have seen, that contains the 
correct number of revisions and is followed by the corresponding detail 
mails with diffs.


So it seems the fix applied by infra works :)

Regards,

Rainer

Am 03.05.2019 um 17:33 schrieb ma...@apache.org:

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 a10ec6e  Update merge info after remaining Commons projects migrated 
to git
  new 56f23b0  No relevant changes to BCEl since last check
  new c3322d0  No changes to codec since last check
  new 05323c3  Update internal fork of Apache Commons FileUpload

The 3 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:
  MERGE.txt  | 10 +-
  .../org/apache/tomcat/util/http/fileupload/FileUploadBase.java |  3 ++-
  .../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, 15 insertions(+), 7 deletions(-)


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

[tomcat] branch master updated: Make test platform independent

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new d127a09  Make test platform independent
d127a09 is described below

commit d127a094f7f724b1bb0b377c9110b210ebac947f
Author: Mark Thomas 
AuthorDate: Fri May 3 21:33:45 2019 +0100

Make test platform independent
---
 test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java 
b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
index 5572df6..6da7b89 100644
--- a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
+++ b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
@@ -59,12 +59,12 @@ public class TestJspRuntimeLibrary extends TomcatBaseTest {
 assertEcho(result, "41-\u");
 assertEcho(result, "42-f");
 assertEcho(result, "43-b");
-assertEcho(result, "44-\n");
+assertEcho(result, "44-" + System.lineSeparator().charAt(0));
 
 assertEcho(result, "51-\u");
 assertEcho(result, "52-f");
 assertEcho(result, "53-b");
-assertEcho(result, "54-\n");
+assertEcho(result, "54-" + System.lineSeparator().charAt(0));
 
 assertEcho(result, "61-0.0");
 assertEcho(result, "62-42.0");


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

[tomcat] branch master updated: Fix test failures. Handle full allocation case.

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new ada725a  Fix test failures. Handle full allocation case.
ada725a is described below

commit ada725a50a60867af3422c8e612aecaeea856a9a
Author: Mark Thomas 
AuthorDate: Fri May 3 21:52:41 2019 +0100

Fix test failures. Handle full allocation case.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 58620fd..170e6c9 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -811,8 +811,10 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 stream.wait(writeTimeout);
 }
 // Has this stream been granted an allocation
+// Note: If the stream in not in this Map then the
+//   requested write has been fully allocated
 int[] value = backLogStreams.get(stream);
-if (value[1] == 0) {
+if (value != null && value[1] == 0) {
 // No allocation
 // Close the connection. Do this first since
 // closing the stream will raise an exception


-
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 test failures. Handle full allocation case.

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 8d14c6f  Fix test failures. Handle full allocation case.
8d14c6f is described below

commit 8d14c6f21d29768a39be4b6b9517060dc6606758
Author: Mark Thomas 
AuthorDate: Fri May 3 21:52:41 2019 +0100

Fix test failures. Handle full allocation case.
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index e5ae91f..a9ab68d 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -815,8 +815,10 @@ public class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpU
 stream.wait(writeTimeout);
 }
 // Has this stream been granted an allocation
+// Note: If the stream in not in this Map then the
+//   requested write has been fully allocated
 int[] value = backLogStreams.get(stream);
-if (value[1] == 0) {
+if (value != null && value[1] == 0) {
 // No allocation
 // Close the connection. Do this first since
 // closing the stream will raise an exception


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

buildbot success in on tomcat-85-trunk

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 8d14c6f21d29768a39be4b6b9517060dc6606758
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 master updated: Fix test failure on MacOS

2019-05-03 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 95c1cc9  Fix test failure on MacOS
95c1cc9 is described below

commit 95c1cc9ddff6da65bd43de9c3557a9c9f4887bfc
Author: Mark Thomas 
AuthorDate: Fri May 3 22:17:28 2019 +0100

Fix test failure on MacOS
---
 test/org/apache/catalina/core/TestStandardService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/org/apache/catalina/core/TestStandardService.java 
b/test/org/apache/catalina/core/TestStandardService.java
index cdb7d7d..0ec93ce 100644
--- a/test/org/apache/catalina/core/TestStandardService.java
+++ b/test/org/apache/catalina/core/TestStandardService.java
@@ -16,6 +16,8 @@
  */
 package org.apache.catalina.core;
 
+import java.net.InetAddress;
+
 import org.junit.Test;
 
 import org.apache.catalina.connector.Connector;
@@ -47,6 +49,7 @@ public class TestStandardService extends TomcatBaseTest {
 Connector c2 = new Connector("HTTP/1.1");
 c2.setThrowOnFailure(throwOnFailure);
 
+c2.setAttribute("address", ((InetAddress) 
connector.getAttribute("address")).getHostAddress());
 c2.setPort(connector.getLocalPort());
 
 tomcat.getService().addConnector(c2);


-
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 (8d14c6f -> 1095dfe)

2019-05-03 Thread markt

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

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


from 8d14c6f  Fix test failures. Handle full allocation case.
 new d7a6e4f  Port svn -> updates from 9.0.x
 new 62cb132  Align with 9.0.x
 new 8e56a34  Update to reflect merges made earlier today
 new 1095dfe  Align with 9.0.x

The 4 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:
 CONTRIBUTING.md | 49 ++
 KEYS| 60 +
 MERGE.txt   | 46 +++
 RUNNING.txt |  2 +-
 4 files changed, 100 insertions(+), 57 deletions(-)


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

[tomcat] 04/04: Align with 9.0.x

2019-05-03 Thread 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 1095dfeb134d3c15f1a930088860b832bd73fb5d
Author: Mark Thomas 
AuthorDate: Fri May 3 22:27:28 2019 +0100

Align with 9.0.x
---
 RUNNING.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RUNNING.txt b/RUNNING.txt
index 476869c..c7f59b9 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -457,7 +457,7 @@ For further reading:
 
   https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
 
-* Windows service HOW-TO
+* Windows Service How-To
 
   
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
 


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

[tomcat] 01/04: Port svn -> updates from 9.0.x

2019-05-03 Thread 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 d7a6e4f77c63cb3c1537178db6e9a2d624f4133b
Author: Mark Thomas 
AuthorDate: Fri May 3 22:26:43 2019 +0100

Port svn -> updates from 9.0.x
---
 CONTRIBUTING.md | 49 +++--
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 28b5ef5..58ea4f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing to Apache Tomcat
 
 Firstly, thanks for your interest in contributing! I hope that this will be a
-pleasant first experience for you, and that you will return to continue
+pleasant experience for you, and that you will return to continue
 contributing.
 
 Please visit our [Get Involved 
page](https://tomcat.apache.org/getinvolved.html)
@@ -38,12 +38,12 @@ the issues marked 'Beginner', link below. Please note that 
the Beginner keyword
 is pretty new to the project, so if there aren't any issues in the filter feel
 free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev).
 
-* [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208&product=Tomcat%209&query_format=advanced)
 -
+* [Beginner 
issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208.5&product=Tomcat%209&query_format=advanced)
 -
 issues which should only require a few lines of code, and a test or two to
 resolve.
 
 The list above shows all bugs that are marked 'Beginner' and are open in the
-currently supported Tomcat versions (7, 8, and 9).
+currently supported Tomcat versions (7, 8.5, and 9).
 
 If you prefer C over Java, you may also take a look at the tomcat-native and
 Tomcat Connectors products in Bugzilla.
@@ -53,15 +53,12 @@ Tomcat Connectors products in Bugzilla.
 Excited yet? This section will guide you through providing a patch to the
 committers of the project for review and acceptance.
 
-# Chose Your Method of Submission
+# Choose Your Method of Submission
 
 You can provide a patch in one of the following ways (in order of preference):
 
+* GitHub Pull Request
 * Patch attachment to the Bugzilla issue
-* Github Pull Request
-> **Note:** Github is a mirror of the SVN repository that Tomcat is stored in
-and therefore it can't be merged outright. Your contribution will be converted
-into an SVN patch and committed with a mention of your name for credit.
 * Email the patch to the developer list. This is not preferred, but if no bug
 is associated with the patch, or you would like a developer review, an email
 may be appropriate.
@@ -73,51 +70,43 @@ source code.
 
 ## Download The Source Distribution
 
-This method works if you want to submit a patch (like you would do for SVN), 
but
+This method works if you want to submit a patch via email, but
 the difference in using the sources distribution and a VCS is that you have to
 manually generate the patch file by using diff. If this is what you want, you
 can download the sources from the "Source Code Distributions" section of the
 Download Page. There is one such page for every major Tomcat version:
+
 - [Tomcat 9](https://tomcat.apache.org/download-90.cgi)
 - [Tomcat 8](https://tomcat.apache.org/download-80.cgi)
 - [Tomcat 7](https://tomcat.apache.org/download-70.cgi)
 
-## SVN
+# Manual Patch Generation
 
 If you have chosen to attach a patch to the Bugzilla issue (or email
-one), then you'll need to checkout the SVN version. Instructions for new
-committers to learn how to do this are found
-[here](https://www.apache.org/dev/contributors.html#svnbasics). However, in the
-interest of a fast ramp up, the short version is below. Note that the root of
-the SVN repository is
-[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
-but you can clone specific versions too, such as
-[tc8.5.x](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/) or even tags (
-[TOMCAT_8_5_15](http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_15/)).
+one), then you'll need to download the sources as noted above, make your
+desired changes and then manually generate your patch using diff (other
+other tool).
 
-```
-$ svn co http://svn.apache.org/repos/asf/tomcat/trunk/
-```
+# GitHub
 
-# Github
-
-For Github, it's almost the same. Chose the major version that you want (for
-now they're in different repositories), fork the repository, and then clone
-your fork to do that work.
+To submit a GitHub Pull Request you'll need to fork the
+[repository](https://github.com/apache/tomcat), clone your fork to do the work:
 
 ```

[tomcat] 03/04: Update to reflect merges made earlier today

2019-05-03 Thread 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 8e56a3453e9b46d1e042257bc52b6fe759e5895a
Author: Mark Thomas 
AuthorDate: Fri May 3 22:27:17 2019 +0100

Update to reflect merges made earlier today
---
 MERGE.txt | 46 --
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index c97bc15..7d24a98 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -22,45 +22,39 @@ ideal. These include:
 - a large JAR where Tomcat only depends on a small fraction
 
 
-SVN
+GIT
 ===
 
-For sources hosted in svn the approach is to svn copy the classes to the Tomcat
-source tree, modify them (always with a package rename, sometimes with
-additional changes) and then keep them in sync with the original via regular 
svn
-merges. This file keeps track of these copies to assist committers in keeping
-them up to date.
+Updates from Git are applied manually via patch files. Patch files are 
generated
+using:
+git diff : HEAD: > temp.patch
+The most recently merged SHA1 for the component below should be updated after
+the patch file has been applied and committed
 
 BCEL
 
-org.apache.tomcat.util.bcel is copied from:
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
+Sub-tree:
+src/main/java/org/apache/bcel
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+33b9f8718ac00b2cbbcc3bf498e55872a3066f19 (2019-04-27)
 
 Codec
 -
-org.apache.tomcat.util.codec is copied from:
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/
+Sub-tree:
+src/main/java/org/apache/commons/codec
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+8502e2f14a6eafb0afa0964b34d1d1bb02b44f64 (2019-04-23)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
-
-GIT
-===
-
-Updates from Git are applied manually via patch files. Patch files are 
generated
-using:
-git diff : HEAD: > temp.patch
-The more recently merged SHA1 for the component below should be updated after
-the patch file has been applied and committed
-
 FileUpload
 --
 Sub-tree:
-src/main/java/org/apache/commons/fileupload
+src/main/java/org/apache/commons/fileupload2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-b1498c9877d751f8bc4635a6f252ebdfcba28518
+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
 
@@ -69,10 +63,10 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-171528a88cca65f5b192be643c2425458d1edfbb
+dcdbc72acf51155d2a6c3f10461d9712a3623686 (2019-04-24)
 
 Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-d4e0e88227ad91d8c8ef36ba01d656f71c770f83
+0664f4dac9ef653703624cbe67272134cf0151cb (2019-04-30)


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

[tomcat] 02/04: Align with 9.0.x

2019-05-03 Thread 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 62cb132ba0a2d4177acc43f983c37f2b5ac5b46d
Author: Mark Thomas 
AuthorDate: Fri May 3 22:26:52 2019 +0100

Align with 9.0.x
---
 KEYS | 60 
 1 file changed, 60 insertions(+)

diff --git a/KEYS b/KEYS
index c0a9353..b77087b 100644
--- a/KEYS
+++ b/KEYS
@@ -614,3 +614,63 @@ 
QCuUl/v3Zly66jThcNS/U6S9VXBtQRxDZtkL8pSzmJxaFvvnZgkQ/hlvJ8f9ccS7
 2/KQU94=
 =yvcP
 -END PGP PUBLIC KEY BLOCK-
+
+pub   rsa4096 2018-10-20 [SC]
+  7659 0809 9ACF 9270 2C7D  949B FA0C 35EA 8AA2 99F1
+uid   Konstantin Kolinko (CODE SIGNING KEY) 
+sig 3FA0C35EA8AA299F1 2018-10-20  Konstantin Kolinko (CODE SIGNING 
KEY) 
+sub   rsa4096 2018-10-20 [E]
+sig  FA0C35EA8AA299F1 2018-10-20  Konstantin Kolinko (CODE SIGNING 
KEY) 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBFvK5u8BEADAYQQ4aUftuWr+CuHgL1iY7i8LqMomEdfyoDAmPPcMQ0Th6r4a
+p/Oq/9OuCAXOfX2ev9FVj9oHynkOUDqRlHfplkquacuQtlhZzFSlkO8Jyk6AcbK0
+dbGMOyiPnOS/+odt2Nxht9ksQvXn61IsQ9YtRZ7GEngaYmVfnZCYeDGy6sghYFrO
+laG8n7MfQaqaVZUVSagMgiHxmtn4Ai8EN7z2MGv/pi4xX6QkfPiTtxoj56DN5Ax/
+rTwyFVgr4mUa2FSn8ytclWXKMjcAIX42UIQ5vtELHMZl6DI2SLxaHQm8JgQ39SFc
+aE4ukji145Srjl2qSiUxr6SJaDi1V5wONCcBkOkoS1M0tdbncpaa89mwrberIrU+
+NoFZvc7YPLCUFBW+cyG3gcAegiRRwwwGd+ETnKEd+i7bNnMbBXtMxox11w2imBz/
+TV13PvaEH5Sp+4PTJ6/7pMORPGjhKjmojXtz5joJSx26CRPfeXxPdB3N0p6jL5tU
+IVNNUhpBvuADQur3FTYxv1mN5h4C6y1nw/HplWyLmo7tjPDgfShv3Cst4G+UHYLf
+15NUO77YhyYKv9RkFBARLTMt3gcxukyNFqaNYoLtTpo2daOvbdKeAVr+TXMfiVOd
+wccKAAieISjHIXI2zaLh7fpkHv6SZR5HxtloQkdcshDXd+H4aTCQS99b1QARAQAB
+tDtLb25zdGFudGluIEtvbGlua28gKENPREUgU0lHTklORyBLRVkpIDxra29saW5r
+b0BhcGFjaGUub3JnPokCTgQTAQgAOBYhBHZZCAmaz5JwLH2Um/oMNeqKopnxBQJb
+yubvAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEPoMNeqKopnxYDsP/1yP
+ViWfh2fUoadTFAIy1TMdJfOqwABPW+1AWACLEsF8dcfA/mRRjrTWhR4+RTyP9Thn
+/qBGsO0oZZrxIXPdqnZq3Dt15StBLHJtexKll8BLRXp56uTV3BPFFiBYHGLvNivW
+QwYBBhMhvcpG+xQdqwhyhfycdyfr75HQ24z+L2i7rrGsKvSWT1F9FSsfgk82fz7T
+HXsMcmDiL7RzZX0vau7l1823ug+q0WLYLIMdbRu4XySTsgmz8cLImDrvOSTiccp3
+hdJbulcoTtfCQOrQkFliUAZ1zBtBcNqyMANp2iwSj24MrI+ofs53PDfKLiqQLxrZ
+7+X7pTapX5IZ4U4Bra9IcoaMYmNLsUUstZUviho57aWWf+H7n9x6+Ny5I6T6KB9b
+W343z6E9LX601AJZnm+nVNoOW6oyfOBcMfEUF5WT2lqy5hRW+wXB3kzUvMMC0O1u
+FAf/9dBbRrRbBCPeECw/OTlquvwe8t7v2FOyD/nVk/Ku50Pr6quf+zoJULXOM1IH
+HzwvTxRblgMobtvU9seVJ455VCCXUkH91Tymt5bY1oXeHD5QR/DGv4ldL8J+IrC+
+9oBbuifZvmO8VeoV4uckdFPkb7ZdjWMOAr87q0dkQsruWZve6aBEaofNyKkP2R7A
+IvtkcBRvEQxgcn1XjV2R6vsLXnhj4h8VLrgL9hbjuQINBFvK5u8BEAC4T9N/Bueq
+oJPLUulnzzSYFwV+09HHLNQIgcLdbbHT/YWoOt52UnotyiTRIEgKHdgHOt/JleDJ
+WyIdJKXBjve+B4qH7QCJYys7TkG2Rp9cCp5DBiv646srTro07YxdjeQxEgeh5ISk
+XzwaHtsAt3mlcpOhc1FFMKTK6OmPzyJDuwmh24VUKXwaF8lygJCTxohIxSrOJgFl
+A4RmMKhlIDNN27PD4gXR35vx9KuT9xMRHYzaK0gG5sls/ECIdhVsYVKs9nk22KLb
+W+ax1btHDBR4qCBqd6BLobtyZOGTDhOjo63PF6lBUiveud+wsQI6Il/7KxfFOyAM
+K6DOSbnkesOwh5ZtrWDp+Fmm9IdkDizZ2wKnZ+MSW7yGVIuJe5F8OhOV1EJobJzi
+w2ZVhE7JjwEJkJ1NVbkz3t3uRdQDbo4uA/rbGyaJvDvZuDudoqosAgmSX3AIlgDo
+UgnUquvGvUA47f88oWnlUMWGf5BtfUwqmrsm5IAhOygwsReWvArdgeLg86CvtUIz
+0lY0AA/Tms+Qq7z9M/yqMbS4KvdjUFIiJMc3qsa2QYTvsIRpaSa29M7p40OHFILy
+CE830AlFodt4126Y5KzPv7W/kx5S2JEaL9/F6eunQXhCq7+qfgaiysK/BcF6iNkW
+8MsYyUb/ssg5ZgRRQGjhYdUA03WJxObLWwARAQABiQI2BBgBCAAgFiEEdlkICZrP
+knAsfZSb+gw16oqimfEFAlvK5u8CGwwACgkQ+gw16oqimfEyzhAAmGslS4w+oIe5
+mV2rxTqhpr0/KUwtdapPSYWgx5yYjNN6kpu0Cm498GfVZvYaHHLKrX5JhC5EZlab
+Bhuo0V1iA5tkjeh824Ty9XSOYG45B836mOVcXpCCPAu5i0JmsQCwvQWYyXuZbGLa
+lQ9LBb2K3c6yBLcXgEHI3MCK/JmGjZo1QJiZYTuLTl8tEZchiwp9iB7fhcSatjGu
+jJSbIb0JqU5c9GhVihq9tucLECJPSo8gC2GXOwqFs2Df4rcsK3Ua099aqj5q6Ugu
+JODlWh4FIYV9YLKkoNCXCIe0geSWBvWD80ccMkSvAAcyy07dQzGw3bAj4DfGa21A
+R/HpTEKqYMkovjOLuDptF8GL8+clXXnMzOswqsWdwQmw8dwk8mR4ZoYLSSVNwEzo
+7LHTyXyJgc4K4UUPTj+nXFdUTDZLoELDc6ok1fcRIM8MalcSw7Jh3ZEJv5kY+Vxn
+rmfUi0P3iaseYZCtykRaRssyFNknOYWIrTtKH9h2rF4oaLsWxLEosVgGZUsbPcTZ
+uYw7knX6NkWTS9IRR3BpJ3tw0kk9DPHK3sNlumdMk0ylzkFbZc7JCQi325WrABsK
+C6Wc1owhZdi9ysx7mshgK4gu7JIAk8ryyN9XbyNjIM6M9aMYxTwECnLQPI8sTALg
+mSKqKZpUdvO77XQVYsjBAu3aMluPBNo=
+=uK1p
+-END PGP PUBLIC KEY BLOCK-


-
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

2019-05-03 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] 01/01: Tag 9.0.20

2019-05-03 Thread markt

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

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

commit 4202de2f20c29f38a6a700133f9724745c7306d8
Author: Mark Thomas 
AuthorDate: Fri May 3 23:23:07 2019 +0100

Tag 9.0.20
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7f48d3a..d77f83a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=20
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 228e867..14fc9a1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 9.0.20 created (now 4202de2)

2019-05-03 Thread markt

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

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


  at 4202de2  (commit)
This tag includes the following new commits:

 new 4202de2  Tag 9.0.20

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



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

svn commit: r33896 - in /dev/tomcat/tomcat-9/v9.0.20: ./ bin/ bin/embed/ src/

2019-05-03 Thread markt

Author: markt
Date: Fri May  3 22:50:44 2019
New Revision: 33896

Log:
Upload 9.0.20 for voting

Added:
dev/tomcat/tomcat-9/v9.0.20/
dev/tomcat/tomcat-9/v9.0.20/KEYS
dev/tomcat/tomcat-9/v9.0.20/README.html
dev/tomcat/tomcat-9/v9.0.20/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.20/bin/
dev/tomcat/tomcat-9/v9.0.20/bin/README.html
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.exe   (with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.exe.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.exe.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.zip   (with props)
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.zip.asc
dev/tomcat/tomcat-9/v9.0.20/bin/apache-tomcat-9.0.20.zip.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/embed/
dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.20/bin/embed/apache-tomcat-9.0.20-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.20/src/
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.zip.asc
dev/tomcat/tomcat-9/v9.0.20/src/apache-tomcat-9.0.20-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.20/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.20/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.20/KEYS Fri May  3 22:50:44 2019
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT
+ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33

[VOTE] Release Apache Tomcat 9.0.20

2019-05-03 Thread Mark Thomas

The proposed Apache Tomcat 9.0.20 release is now available for voting.

The major changes compared to the 9.0.19 release are:

- The useAsyncIO boolean attribute on the Connector element value now
  defaults to true.

- Stack traces written by the OneLineFormatter are fully indented. The
  entire stack trace is now indented by an additional TAB character.

- Various HTTP/2 improvements and stability fixes.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.20/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1211/
The tag is:
https://github.com/apache/tomcat/tree/9.0.20
4202de2f20c29f38a6a700133f9724745c7306d8

The proposed 9.0.20 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.20

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

[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

2019-05-03 Thread Bill Barker

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 42 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 15 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar 
-Dsaaj-api.jar=/srv/gump/packages/saaj-api/saaj-api-1.3.5.jar 
-Djaxrpc-lib.jar=/srv/gump/packages/jaxrpc/geronimo-spec-jaxrpc-1.1-rc4.jar 
-Dtest.temp=output/test-tmp-NIO2 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20190504/bin/openssl
 -Dexecute
 .test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar 
-Dexecute.test.apr=false 
-Dwsdl4j-lib.jar=/srv/gump/packages/wsdl4j/wsdl4j-1.6.3.jar 
-Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.10-201812060815/ecj-4.10.jar 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-4.1-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/out

43 matches

Mail list logo