[GitHub] [tomcat] rmaucher commented on pull request #382: Add support for unix domain sockets.

[GitBox]

rmaucher commented on pull request #382:
URL: https://github.com/apache/tomcat/pull/382#issuecomment-761238160


   > > * The permission attribute, is it really useful ?
   > 
   > In the absence of a permission attribute (and without the "everyone" 
default), the socket is equivalent to a TCP port that has been firewalled off, 
and thus pointless.
   > 
   > Ignoring special cases like a personal development environment, or a 
system with no user separation, daemons (like tomcat) are secured with a user 
tomcat, group tomcat, and a typical umask of 0750 (or some variation). This 
means that the a) the tomcat user can write, b) the tomcat group can read 
(typically allowing read access to log files), and c) everyone else get nothing.
   > 
   > In order for any unix domain socket to be of use to anyone, it must be 
possible to write to it. If you can't write to it, you cannot submit a request. 
A unix domain socket that only the tomcat user can write to pointless, as 
you've giving the client control over the tomcat process. A read only unix 
domain socket for a request/response protocol like HTTP has no practical effect 
- having written nothing you will read nothing.
   > 
   > For this reason, every daemon out there that I have seen has a mechanism 
to make the socket writable to a group, and defaulting to being accessible to 
everyone:
   > 
   > 
https://github.com/Cisco-Talos/clamav-devel/blob/31824a659dff37ae03e3419395bb68e659c2b165/etc/clamd.conf.sample#L104
   > 
   > 
https://github.com/trusteddomainproject/OpenDMARC/blob/b0d6408d0859adb336428e3d0bd87749513a9e79/opendmarc/opendmarc.conf.sample#L357
   > 
   > 
https://github.com/rspamd/rspamd/blob/9c2d72c6eba3fc05fd7459e388ea7c92eb87095f/conf/options.inc#L48
   > 
   > In the absence of an explicit control over permissions, making the 
permissions world writable by default allows the admin to secure the socket by 
restricting permissions on the parent directory, such as the following example:
   > 
   > ```
   > [root@localhost clamav-milter]# ls -al
   > total 0
   > drwx--x---.  2 clamilt clamilt   60 Jan 11 13:03 .
   > drwxr-xr-x. 39 rootroot1080 Jan 11 13:06 ..
   > srw-rw-rw-.  1 clamilt clamilt0 Jan 11 13:03 clamav-milter.socket
   > ```
   > 
   > In the above, the socket itself is world writable, but the parent 
directory is protected, and therefore the socket is protected.
   > 
   > > * The socket is not deleted on shutdown (although the channel is closed)
   > 
   > If the socket is not deleted on shutdown, the server cannot subsequently 
be started up. Deleting the socket on shutdown is the most common behaviour. 
Deleting the socket is startup is not done, as it means that multiple daemons 
can be started without error.
   > 
   > I think I saw a commit go past fixing this, need to verify.
   
   Ok, I still dislike the permission attribute quite a bit but I can 
understand things can be annoying without it in some cases.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[Bug 64850] Add support to tomcat for JEP380: Unix domain sockets

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64850

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #9 from Remy Maucherat  ---
No idea there was a BZ. Implemented in Tomcat 10.0.1 and 9.0.42.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] minfrin commented on pull request #382: Add support for unix domain sockets.

[GitBox]

minfrin commented on pull request #382:
URL: https://github.com/apache/tomcat/pull/382#issuecomment-761110354


   > I added the feature for NIO, since it wasn't too difficult using 
https://openjdk.java.net/jeps/380 .
   
   Thank you for doing this, it is a huge help.
   
   This patch is all about supporting people who are not yet in a position to 
use Java 16.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

buildbot success in on tomcat-85-trunk

[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/2587

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 5601e5183ecd32fb53c02e31e58416c263bb172a
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

[GitHub] [tomcat] michael-o commented on pull request #401: Add support for unix domain sockets (APR Protocol)

[GitBox]

michael-o commented on pull request #401:
URL: https://github.com/apache/tomcat/pull/401#issuecomment-761074064


   Give me a couple of days and I will run this on FreeBSD and HP-UX.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[Bug 64850] Add support to tomcat for JEP380: Unix domain sockets

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64850

--- Comment #8 from Graham Leggett  ---
Tomcat-native v1.2.26 released with UDS support.

New patch proposed for APR here:

https://github.com/apache/tomcat/pull/401

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] minfrin commented on pull request #382: Add support for unix domain sockets.

[GitBox]

minfrin commented on pull request #382:
URL: https://github.com/apache/tomcat/pull/382#issuecomment-761071502


   > @minfrin Do you want to peform anymore changes or do want to me run 
verifcation on it? Do you think a test would be possible to start up and shut 
down a UDS?
   
   I've added a test based on the existing APR tests. Can you confirm this is 
all ok?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[tomcat] 02/02: Fix back-port of Pool2 update not to use default methods

[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 5601e5183ecd32fb53c02e31e58416c263bb172a
Author: Mark Thomas 
AuthorDate: Fri Jan 15 16:39:00 2021 +

Fix back-port of Pool2 update not to use default methods
---
 java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java |  4 +---
 .../org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java |  4 +---
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  |  4 +---
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   | 10 ++
 java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java |  4 +---
 .../apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java |  6 ++
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index 0228dff..72e7b15 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -278,9 +278,7 @@ public interface KeyedObjectPool extends Closeable {
  * @throws Exception if the instance cannot be invalidated
  * @since 2.9.0
  */
-default void invalidateObject(final K key, final V obj, final DestroyMode 
mode) throws Exception {
-invalidateObject(key, obj);
-}
+void invalidateObject(final K key, final V obj, final DestroyMode mode) 
throws Exception;
 
 /**
  * Return an instance to the pool. By contract, {@code obj}
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
index 0a24a47..e1a9d74 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
@@ -129,9 +129,7 @@ public interface KeyedPooledObjectFactory {
  * @see DestroyMode
  * @since 2.9.0
  */
-default void destroyObject(final K key, final PooledObject p, final 
DestroyMode mode) throws Exception {
-destroyObject(key, p);
-}
+void destroyObject(final K key, final PooledObject p, final DestroyMode 
mode) throws Exception;
 
 /**
  * Ensures that the instance is safe to be returned by the pool.
diff --git a/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
index 7e14caa..2647687 100644
--- a/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
@@ -199,9 +199,7 @@ public interface ObjectPool extends Closeable {
  * @throws Exception if the instance cannot be invalidated
  * @since 2.9.0
  */
-default void invalidateObject(final T obj, final DestroyMode mode) throws 
Exception {
-invalidateObject(obj);
-}
+void invalidateObject(final T obj, final DestroyMode mode) throws 
Exception;
 
 /**
  * Returns an instance to the pool. By contract, {@code obj}
diff --git a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java 
b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
index a187c31..b087507 100644
--- a/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
+++ b/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
@@ -538,6 +538,11 @@ public final class PoolUtils {
 }
 }
 
+@Override
+public void destroyObject(PooledObject p, DestroyMode mode) throws 
Exception {
+destroyObject(p);
+}
+
 /**
  * {@inheritDoc}
  */
@@ -657,6 +662,11 @@ public final class PoolUtils {
 }
 }
 
+@Override
+public void destroyObject(K key, PooledObject p, DestroyMode mode) 
throws Exception {
+destroyObject(key, p);
+}
+
 /**
  * {@inheritDoc}
  */
diff --git a/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java
index 9c95d0d..daff431 100644
--- a/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java
@@ -122,9 +122,7 @@ public interface PooledObjectFactory {
* @see DestroyMode
* @since 2.9.0
*/
-  default void destroyObject(final PooledObject p, final DestroyMode mode) 
throws Exception {
-  destroyObject(p);
-  }
+  void destroyObject(final PooledObject p, final DestroyMode mode) throws 
Exception;
 
   /**
* Ensures that the instance is safe to be returned by the pool.
diff --git 
a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
index f9cce30..6d653e3 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 

[tomcat] 01/02: Update Commons DBCP

[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 2aaffcd5fb05daa4ee138b59c84ec3a66be3961d
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:42:38 2021 +

Update Commons DBCP
---
 MERGE.txt  |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  |  24 ++---
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  40 ---
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |   5 +-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  18 ++--
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |   3 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |   6 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |  17 ++-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |  13 +--
 .../apache/tomcat/dbcp/dbcp2/DriverFactory.java|   6 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |  26 +++--
 .../dbcp/dbcp2/LifetimeExceededException.java  |   1 -
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |   8 +-
 java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|  71 +++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |   4 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |  20 +++-
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  41 ---
 .../dbcp/dbcp2/PoolablePreparedStatement.java  |   8 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |  17 ++-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |   4 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java|  16 ++-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |  45 +---
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java |   4 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 118 +++--
 .../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java   |   4 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|  55 --
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  19 ++--
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   7 --
 .../datasources/InstanceKeyDataSourceFactory.java  |  18 ++--
 .../datasources/KeyedCPDSConnectionFactory.java|  20 ++--
 .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |  26 ++---
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |  23 +---
 .../dbcp/dbcp2/datasources/package-info.java   |   2 +-
 webapps/docs/changelog.xml |   4 +
 35 files changed, 326 insertions(+), 371 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 52851d9..806669a 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-6d232e547d5725e419832fc514fc0348aa897e7c (2020-08-11)
+e24196a95bbbc531eb3c5f1b19e1dc42fd78a783 (2021-01-15)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 61afa6f..8f11d75 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -539,7 +539,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 
 // Set up the poolable connection factory
 boolean success = false;
-PoolableConnectionFactory poolableConnectionFactory;
+final PoolableConnectionFactory poolableConnectionFactory;
 try {
 poolableConnectionFactory = 
createPoolableConnectionFactory(driverConnectionFactory);
 
poolableConnectionFactory.setPoolStatements(poolPreparedStatements);
@@ -616,7 +616,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 protected GenericObjectPool createObjectPool(final 
PoolableConnectionFactory factory,
 final GenericObjectPoolConfig poolConfig, 
final AbandonedConfig abandonedConfig) {
-GenericObjectPool gop;
+final GenericObjectPool gop;
 if (abandonedConfig != null && 
(abandonedConfig.getRemoveAbandonedOnBorrow()
 || abandonedConfig.getRemoveAbandonedOnMaintenance())) {
 gop = new GenericObjectPool<>(factory, poolConfig, 
abandonedConfig);
@@ -697,7 +697,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 @Override
 public boolean getAbandonedUsageTracking() {
-return abandonedConfig == null ? false : 
abandonedConfig.getUseUsageTracking();
+return abandonedConfig != null && 
abandonedConfig.getUseUsageTracking();
 }
 
 /**
@@ -793,8 +793,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 @Override
 public String[] getConnectionInitSqlsAsArray() {
-final Collection result = 

[tomcat] branch 8.5.x updated (6dcb374 -> 5601e51)

[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 6dcb374  Update Commons Pool 2 to 2.9.1-SNAPSHOT
 new 2aaffcd  Update Commons DBCP
 new 5601e51  Fix back-port of Pool2 update not to use default methods

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:
 MERGE.txt  |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  |  24 ++---
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  40 ---
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |   5 +-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  18 ++--
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |   3 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |   6 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |  17 ++-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |  13 +--
 .../apache/tomcat/dbcp/dbcp2/DriverFactory.java|   6 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |  26 +++--
 .../dbcp/dbcp2/LifetimeExceededException.java  |   1 -
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |   8 +-
 java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|  71 +++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |   4 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |  20 +++-
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  41 ---
 .../dbcp/dbcp2/PoolablePreparedStatement.java  |   8 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |  17 ++-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |   4 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java|  16 ++-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |  45 +---
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java |   4 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 118 +++--
 .../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java   |   4 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|  55 --
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  19 ++--
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   7 --
 .../datasources/InstanceKeyDataSourceFactory.java  |  18 ++--
 .../datasources/KeyedCPDSConnectionFactory.java|  20 ++--
 .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |  26 ++---
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |  23 +---
 .../dbcp/dbcp2/datasources/package-info.java   |   2 +-
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  |   4 +-
 .../dbcp/pool2/KeyedPooledObjectFactory.java   |   4 +-
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  |   4 +-
 java/org/apache/tomcat/dbcp/pool2/PoolUtils.java   |  10 ++
 .../tomcat/dbcp/pool2/PooledObjectFactory.java |   4 +-
 .../dbcp/pool2/impl/SoftReferenceObjectPool.java   |   6 ++
 webapps/docs/changelog.xml |   4 +
 41 files changed, 346 insertions(+), 383 deletions(-)


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

[GitHub] [tomcat] minfrin closed pull request #382: Add support for unix domain sockets.

[GitBox]

minfrin closed pull request #382:
URL: https://github.com/apache/tomcat/pull/382


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] minfrin commented on pull request #382: Add support for unix domain sockets.

[GitBox]

minfrin commented on pull request #382:
URL: https://github.com/apache/tomcat/pull/382#issuecomment-761070369


   Life is too short to fight with git.
   
   Opened a fresh PR at https://github.com/apache/tomcat/pull/401.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

[GitHub] [tomcat] minfrin opened a new pull request #401: Add support for unix domain sockets (APR Protocol)

[GitBox]

minfrin opened a new pull request #401:
URL: https://github.com/apache/tomcat/pull/401


   Add support and test case for Unix Domain Sockets in
   org.apache.coyote.http11.Http11AprProtocol, to support
   users using Java versions older than 16.
   
   Requires tomcat-native 1.2.26 and above.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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

buildbot failure in on tomcat-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 3396e7bc419415cbe530be1ba0eba241d9f70626
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 9.0.x updated: Update Commons DBCP

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c615856  Update Commons DBCP
c615856 is described below

commit c61585616d9f7bcf68c93ad3d2eefdbf9ebb53a4
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:42:38 2021 +

Update Commons DBCP
---
 MERGE.txt  |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  |  24 ++---
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  40 ---
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |  13 ++-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  18 ++--
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |   3 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |   6 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |  17 ++-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |  13 +--
 .../apache/tomcat/dbcp/dbcp2/DriverFactory.java|   6 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |   6 ++
 .../dbcp/dbcp2/LifetimeExceededException.java  |   1 -
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |   8 +-
 java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|  71 +++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |   4 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |  20 +++-
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  45 +---
 .../dbcp/dbcp2/PoolablePreparedStatement.java  |   8 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |  10 +-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |   4 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java|  16 ++-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |  45 +---
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java |   4 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 118 +++--
 .../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java   |   4 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|  22 ++--
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  11 +-
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   7 --
 .../datasources/InstanceKeyDataSourceFactory.java  |  18 ++--
 .../datasources/KeyedCPDSConnectionFactory.java|  13 +--
 .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |  26 ++---
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |  23 +---
 .../dbcp/dbcp2/datasources/package-info.java   |   2 +-
 .../dbcp/dbcp2/managed/BasicManagedDataSource.java |  32 +++---
 .../managed/DataSourceXAConnectionFactory.java |  34 +++---
 .../dbcp2/managed/LocalXAConnectionFactory.java|  35 +++---
 .../dbcp/dbcp2/managed/ManagedConnection.java  |  35 +++---
 .../dbcp/dbcp2/managed/ManagedDataSource.java  |  32 +++---
 .../managed/PoolableManagedConnectionFactory.java  |   2 +-
 .../dbcp/dbcp2/managed/TransactionContext.java |  34 +++---
 .../dbcp2/managed/TransactionContextListener.java  |  32 +++---
 .../dbcp/dbcp2/managed/TransactionRegistry.java|  34 +++---
 .../dbcp/dbcp2/managed/XAConnectionFactory.java|  32 +++---
 webapps/docs/changelog.xml |   4 +
 45 files changed, 424 insertions(+), 512 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 52851d9..806669a 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-6d232e547d5725e419832fc514fc0348aa897e7c (2020-08-11)
+e24196a95bbbc531eb3c5f1b19e1dc42fd78a783 (2021-01-15)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 5ac1372..08762f0 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -528,7 +528,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 
 // Set up the poolable connection factory
 boolean success = false;
-PoolableConnectionFactory poolableConnectionFactory;
+final PoolableConnectionFactory poolableConnectionFactory;
 try {
 poolableConnectionFactory = 
createPoolableConnectionFactory(driverConnectionFactory);
 
poolableConnectionFactory.setPoolStatements(poolPreparedStatements);
@@ -605,7 +605,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 protected GenericObjectPool createObjectPool(final 
PoolableConnectionFactory factory,
 final GenericObjectPoolConfig poolConfig, 
final AbandonedConfig abandonedConfig) {
-GenericObjectPool gop;
+final GenericObjectPool gop;
 if (abandonedConfig != null && 

[tomcat] branch master updated: Remove file added in error

[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 3396e7b  Remove file added in error
3396e7b is described below

commit 3396e7bc419415cbe530be1ba0eba241d9f70626
Author: Mark Thomas 
AuthorDate: Fri Jan 15 16:17:03 2021 +

Remove file added in error
---
 java/org/apache/tomcat/dbcp/dbcp2/package-info.java.rej | 9 -
 1 file changed, 9 deletions(-)

diff --git a/java/org/apache/tomcat/dbcp/dbcp2/package-info.java.rej 
b/java/org/apache/tomcat/dbcp/dbcp2/package-info.java.rej
deleted file mode 100644
index 7387a47..000
--- a/java/org/apache/tomcat/dbcp/dbcp2/package-info.java.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-@@ -53,7 +53,7 @@
-  * actual database {@link java.sql.Connection}s itself, it uses a {@link 
org.apache.commons.dbcp2.ConnectionFactory} for
-  * that. The {@link org.apache.commons.dbcp2.PoolableConnectionFactory} will 
take {@link java.sql.Connection}s created
-  * by the {@link org.apache.commons.dbcp2.ConnectionFactory} and wrap them 
with classes that implement the pooling
-- * behaviour.
-+ * behavior.
-  * 
-  * 
-  * Several implementations of {@link 
org.apache.commons.dbcp2.ConnectionFactory} are provided--one that uses


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

[tomcat] branch master updated: Update Commons DBCP

[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 3f889ee  Update Commons DBCP
3f889ee is described below

commit 3f889eedce818351b216f87aae67e2a77816f7ab
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:42:38 2021 +

Update Commons DBCP
---
 MERGE.txt  |   2 +-
 .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java  |  24 ++---
 .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java  |  40 ---
 .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java   |  13 ++-
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java|  18 ++--
 .../dbcp/dbcp2/DelegatingDatabaseMetaData.java |   3 +-
 .../tomcat/dbcp/dbcp2/DelegatingResultSet.java |   6 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java |  17 ++-
 .../tomcat/dbcp/dbcp2/DriverConnectionFactory.java |  13 +--
 .../apache/tomcat/dbcp/dbcp2/DriverFactory.java|   6 +-
 .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java |   6 ++
 .../dbcp/dbcp2/LifetimeExceededException.java  |   1 -
 .../tomcat/dbcp/dbcp2/ObjectNameWrapper.java   |   8 +-
 java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|  71 +++--
 .../dbcp/dbcp2/PoolableCallableStatement.java  |   4 +-
 .../tomcat/dbcp/dbcp2/PoolableConnection.java  |  20 +++-
 .../dbcp/dbcp2/PoolableConnectionFactory.java  |  45 +---
 .../dbcp/dbcp2/PoolablePreparedStatement.java  |   8 +-
 .../tomcat/dbcp/dbcp2/PoolingConnection.java   |  10 +-
 .../tomcat/dbcp/dbcp2/PoolingDataSource.java   |   4 +-
 .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java|  16 ++-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Utils.java   |  45 +---
 .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java |   4 +-
 .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java  | 118 +++--
 .../dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java   |   4 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java|  22 ++--
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  11 +-
 .../dbcp2/datasources/InstanceKeyDataSource.java   |   7 --
 .../datasources/InstanceKeyDataSourceFactory.java  |  18 ++--
 .../datasources/KeyedCPDSConnectionFactory.java|  13 +--
 .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |  26 ++---
 .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java |  23 +---
 .../dbcp/dbcp2/datasources/package-info.java   |   2 +-
 .../dbcp/dbcp2/managed/BasicManagedDataSource.java |  32 +++---
 .../managed/DataSourceXAConnectionFactory.java |  34 +++---
 .../dbcp2/managed/LocalXAConnectionFactory.java|  35 +++---
 .../dbcp/dbcp2/managed/ManagedConnection.java  |  35 +++---
 .../dbcp/dbcp2/managed/ManagedDataSource.java  |  32 +++---
 .../managed/PoolableManagedConnectionFactory.java  |   2 +-
 .../dbcp/dbcp2/managed/TransactionContext.java |  34 +++---
 .../dbcp2/managed/TransactionContextListener.java  |  32 +++---
 .../dbcp/dbcp2/managed/TransactionRegistry.java|  34 +++---
 .../dbcp/dbcp2/managed/XAConnectionFactory.java|  32 +++---
 .../apache/tomcat/dbcp/dbcp2/package-info.java.rej |   9 ++
 webapps/docs/changelog.xml |   4 +
 46 files changed, 433 insertions(+), 512 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 52851d9..806669a 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-6d232e547d5725e419832fc514fc0348aa897e7c (2020-08-11)
+e24196a95bbbc531eb3c5f1b19e1dc42fd78a783 (2021-01-15)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 5ac1372..08762f0 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -528,7 +528,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
 
 // Set up the poolable connection factory
 boolean success = false;
-PoolableConnectionFactory poolableConnectionFactory;
+final PoolableConnectionFactory poolableConnectionFactory;
 try {
 poolableConnectionFactory = 
createPoolableConnectionFactory(driverConnectionFactory);
 
poolableConnectionFactory.setPoolStatements(poolPreparedStatements);
@@ -605,7 +605,7 @@ public class BasicDataSource implements DataSource, 
BasicDataSourceMXBean, MBean
  */
 protected GenericObjectPool createObjectPool(final 
PoolableConnectionFactory factory,
 final GenericObjectPoolConfig poolConfig, 
final AbandonedConfig abandonedConfig) {
-GenericObjectPool gop;
+final GenericObjectPool gop;
  

buildbot failure in on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] a6d4fbe876bfbcba657859dd869c4392dcb75ddd
Blamelist: Mark Thomas 

BUILD FAILED: failed compile

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-85-trunk

[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/2586

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

Buildslave for this Build: asf946_ubuntu

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

[tomcat] branch 7.0.x updated: Align with Codec

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new a6d4fbe  Align with Codec
a6d4fbe is described below

commit a6d4fbe876bfbcba657859dd869c4392dcb75ddd
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:07:13 2021 +

Align with Codec
---
 java/org/apache/tomcat/util/codec/binary/Base64.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 3c76ca2..77ff7eb 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.codec.binary;
 
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * Provides Base64 encoding and decoding as defined by http://www.ietf.org/rfc/rfc2045.txt;>RFC 2045.
@@ -331,9 +332,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.4
  */
 public static byte[] encodeInteger(final BigInteger bigInteger) {
-if (bigInteger == null) {
-throw new 
NullPointerException(sm.getString("base64.nullEncodeParameter"));
-}
+
Objects.requireNonNull(bigInteger,sm.getString("base64.nullEncodeParameter"));
 return encodeBase64(toIntegerBytes(bigInteger), false);
 }
 
@@ -375,7 +374,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte element : arrayOctet) {
+for (final byte element : arrayOctet) {
 if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }


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

[tomcat] 02/02: Update Commons Pool 2 to 2.9.1-SNAPSHOT

[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 6dcb37427b383eec9c2c6e502b12c52002fb79fd
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:18:03 2021 +

Update Commons Pool 2 to 2.9.1-SNAPSHOT
---
 MERGE.txt  |  2 +-
 java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 30 +++
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 webapps/docs/changelog.xml |  4 ++
 10 files changed, 208 insertions(+), 39 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 8071016..52851d9 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -62,7 +62,7 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.8.1
+a38c52529beb04bf0815b7d95fb4a393ea110dee
 
 DBCP2
 Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java 
b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
new file mode 100644
index 000..ed8ca47
--- /dev/null
+++ b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.dbcp.pool2;
+
+/**
+ * Destroy context provided to object factories via destroyObject methods. 
Values provide information about why the pool
+ * is asking for a pooled object to be destroyed.
+ *
+ * @since 2.9.0
+ */
+public enum DestroyMode {
+/** Normal destroy */
+NORMAL,
+/** Destroy abandoned object */
+ABANDONED
+}
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index 5e9f2f3..0228dff 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -255,6 +255,33 @@ public interface KeyedObjectPool extends Closeable {
  */
 void invalidateObject(K key, V obj) throws Exception;
 
+
+/**
+ * Invalidates an object from the pool, using the provided
+ * {@link DestroyMode}.
+ * 
+ * By contract, {@code obj} must have been obtained
+ * using {@link #borrowObject borrowObject} or a related method as defined
+ * in an implementation or sub-interface using a {@code key} that is
+ * equivalent to the one used to borrow the {@code Object} in the first
+ * place.
+ * 
+ * 
+ * This method should be used when an object that has been borrowed is
+ * determined (due to an exception or other problem) to be invalid.
+ * 
+ *
+ * @param key the key used to obtain the object
+ * @param obj a {@link #borrowObject borrowed} instance to be returned.
+ * @param mode destroy activation context provided to the factory
+ *
+ * @throws Exception if the instance cannot be invalidated
+ * @since 2.9.0
+ */
+default void invalidateObject(final K key, final V obj, final DestroyMode 
mode) throws Exception {
+invalidateObject(key, obj);
+}
+
 /**
  * Return an instance to the pool. By contract, {@code obj}
  * must have been obtained using
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
index 5bf8b11..0a24a47 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
@@ -114,6 +114,26 @@ public interface KeyedPooledObjectFactory {
 void destroyObject(K key, PooledObject p) throws Exception;
 
 /**
+ * Destroy an instance no longer needed by the pool, using the provided 
{@link DestroyMode}.
+ *
+ * @param key the key 

[tomcat] 01/02: Align with Codec

[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 1fa8196d3f79fffa9ff52de4f93c1e4d43c156e3
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:07:13 2021 +

Align with Codec
---
 java/org/apache/tomcat/util/codec/binary/Base64.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 08d7d34..3cd4f1a 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.codec.binary;
 
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * Provides Base64 encoding and decoding as defined by http://www.ietf.org/rfc/rfc2045.txt;>RFC 2045.
@@ -331,9 +332,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.4
  */
 public static byte[] encodeInteger(final BigInteger bigInteger) {
-if (bigInteger == null) {
-throw new 
NullPointerException(sm.getString("base64.nullEncodeParameter"));
-}
+
Objects.requireNonNull(bigInteger,sm.getString("base64.nullEncodeParameter"));
 return encodeBase64(toIntegerBytes(bigInteger), false);
 }
 
@@ -360,7 +359,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte element : arrayOctet) {
+for (final byte element : arrayOctet) {
 if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }


-
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 (0390727 -> 6dcb374)

[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 0390727  Update Commons FileUpload - cosmetic only
 new 1fa8196  Align with Codec
 new 6dcb374  Update Commons Pool 2 to 2.9.1-SNAPSHOT

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:
 MERGE.txt  |  2 +-
 .../apache/tomcat/dbcp/pool2/DestroyMode.java} | 16 +++---
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 .../apache/tomcat/util/codec/binary/Base64.java|  7 ++-
 webapps/docs/changelog.xml |  4 ++
 11 files changed, 190 insertions(+), 50 deletions(-)
 copy java/{javax/el/VariableMapper.java => 
org/apache/tomcat/dbcp/pool2/DestroyMode.java} (70%)


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

[tomcat] 02/02: Update Commons Pool 2 to 2.9.1-SNAPSHOT

[markt]

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

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

commit eeb261df715aaad54eed6dc31630ed3f7697fc8c
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:18:03 2021 +

Update Commons Pool 2 to 2.9.1-SNAPSHOT
---
 MERGE.txt  |  2 +-
 java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 30 +++
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 webapps/docs/changelog.xml |  4 ++
 10 files changed, 208 insertions(+), 39 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 8071016..52851d9 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -62,7 +62,7 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.8.1
+a38c52529beb04bf0815b7d95fb4a393ea110dee
 
 DBCP2
 Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java 
b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
new file mode 100644
index 000..ed8ca47
--- /dev/null
+++ b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.dbcp.pool2;
+
+/**
+ * Destroy context provided to object factories via destroyObject methods. 
Values provide information about why the pool
+ * is asking for a pooled object to be destroyed.
+ *
+ * @since 2.9.0
+ */
+public enum DestroyMode {
+/** Normal destroy */
+NORMAL,
+/** Destroy abandoned object */
+ABANDONED
+}
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index 9e5d550..f2712d9 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -269,6 +269,33 @@ public interface KeyedObjectPool extends Closeable {
  */
 void invalidateObject(K key, V obj) throws Exception;
 
+
+/**
+ * Invalidates an object from the pool, using the provided
+ * {@link DestroyMode}.
+ * 
+ * By contract, {@code obj} must have been obtained
+ * using {@link #borrowObject borrowObject} or a related method as defined
+ * in an implementation or sub-interface using a {@code key} that is
+ * equivalent to the one used to borrow the {@code Object} in the first
+ * place.
+ * 
+ * 
+ * This method should be used when an object that has been borrowed is
+ * determined (due to an exception or other problem) to be invalid.
+ * 
+ *
+ * @param key the key used to obtain the object
+ * @param obj a {@link #borrowObject borrowed} instance to be returned.
+ * @param mode destroy activation context provided to the factory
+ *
+ * @throws Exception if the instance cannot be invalidated
+ * @since 2.9.0
+ */
+default void invalidateObject(final K key, final V obj, final DestroyMode 
mode) throws Exception {
+invalidateObject(key, obj);
+}
+
 /**
  * Return an instance to the pool. By contract, {@code obj}
  * must have been obtained using
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
index 5bf8b11..0a24a47 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
@@ -114,6 +114,26 @@ public interface KeyedPooledObjectFactory {
 void destroyObject(K key, PooledObject p) throws Exception;
 
 /**
+ * Destroy an instance no longer needed by the pool, using the provided 
{@link DestroyMode}.
+ *
+ * @param key the key 

[tomcat] branch 9.0.x updated (ffa2c1c -> eeb261d)

[markt]

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

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


from ffa2c1c  Update Commons FileUpload - cosmetic only
 new 9eaf35f  Align with Codec
 new eeb261d  Update Commons Pool 2 to 2.9.1-SNAPSHOT

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:
 MERGE.txt  |  2 +-
 .../dbcp/pool2/DestroyMode.java}   | 19 ---
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 .../apache/tomcat/util/codec/binary/Base64.java|  7 ++-
 webapps/docs/changelog.xml |  4 ++
 11 files changed, 190 insertions(+), 53 deletions(-)
 copy java/org/apache/{catalina/ha/tcp/Constants.java => 
tomcat/dbcp/pool2/DestroyMode.java} (70%)


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

[tomcat] 01/02: Align with Codec

[markt]

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

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

commit 9eaf35f18b3e6dbd1e0920a3640538aa765d860d
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:07:13 2021 +

Align with Codec
---
 java/org/apache/tomcat/util/codec/binary/Base64.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 08d7d34..3cd4f1a 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.codec.binary;
 
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * Provides Base64 encoding and decoding as defined by http://www.ietf.org/rfc/rfc2045.txt;>RFC 2045.
@@ -331,9 +332,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.4
  */
 public static byte[] encodeInteger(final BigInteger bigInteger) {
-if (bigInteger == null) {
-throw new 
NullPointerException(sm.getString("base64.nullEncodeParameter"));
-}
+
Objects.requireNonNull(bigInteger,sm.getString("base64.nullEncodeParameter"));
 return encodeBase64(toIntegerBytes(bigInteger), false);
 }
 
@@ -360,7 +359,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte element : arrayOctet) {
+for (final byte element : arrayOctet) {
 if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }


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

[tomcat] 01/02: Align with Codec

[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 ac39b5658cfc875a0c9dc339eb114256182a92ce
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:07:13 2021 +

Align with Codec
---
 java/org/apache/tomcat/util/codec/binary/Base64.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 08d7d34..3cd4f1a 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.codec.binary;
 
 import java.math.BigInteger;
+import java.util.Objects;
 
 /**
  * Provides Base64 encoding and decoding as defined by http://www.ietf.org/rfc/rfc2045.txt;>RFC 2045.
@@ -331,9 +332,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.4
  */
 public static byte[] encodeInteger(final BigInteger bigInteger) {
-if (bigInteger == null) {
-throw new 
NullPointerException(sm.getString("base64.nullEncodeParameter"));
-}
+
Objects.requireNonNull(bigInteger,sm.getString("base64.nullEncodeParameter"));
 return encodeBase64(toIntegerBytes(bigInteger), false);
 }
 
@@ -360,7 +359,7 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte element : arrayOctet) {
+for (final byte element : arrayOctet) {
 if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }


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

[tomcat] 02/02: Update Commons Pool 2 to 2.9.1-SNAPSHOT

[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 b346ab44c212af9475729a47d16b19ed4f0f276f
Author: Mark Thomas 
AuthorDate: Fri Jan 15 15:18:03 2021 +

Update Commons Pool 2 to 2.9.1-SNAPSHOT
---
 MERGE.txt  |  2 +-
 java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 30 +++
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 webapps/docs/changelog.xml |  4 ++
 10 files changed, 208 insertions(+), 39 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 8071016..52851d9 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -62,7 +62,7 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.8.1
+a38c52529beb04bf0815b7d95fb4a393ea110dee
 
 DBCP2
 Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java 
b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
new file mode 100644
index 000..ed8ca47
--- /dev/null
+++ b/java/org/apache/tomcat/dbcp/pool2/DestroyMode.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.dbcp.pool2;
+
+/**
+ * Destroy context provided to object factories via destroyObject methods. 
Values provide information about why the pool
+ * is asking for a pooled object to be destroyed.
+ *
+ * @since 2.9.0
+ */
+public enum DestroyMode {
+/** Normal destroy */
+NORMAL,
+/** Destroy abandoned object */
+ABANDONED
+}
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index 9e5d550..f2712d9 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -269,6 +269,33 @@ public interface KeyedObjectPool extends Closeable {
  */
 void invalidateObject(K key, V obj) throws Exception;
 
+
+/**
+ * Invalidates an object from the pool, using the provided
+ * {@link DestroyMode}.
+ * 
+ * By contract, {@code obj} must have been obtained
+ * using {@link #borrowObject borrowObject} or a related method as defined
+ * in an implementation or sub-interface using a {@code key} that is
+ * equivalent to the one used to borrow the {@code Object} in the first
+ * place.
+ * 
+ * 
+ * This method should be used when an object that has been borrowed is
+ * determined (due to an exception or other problem) to be invalid.
+ * 
+ *
+ * @param key the key used to obtain the object
+ * @param obj a {@link #borrowObject borrowed} instance to be returned.
+ * @param mode destroy activation context provided to the factory
+ *
+ * @throws Exception if the instance cannot be invalidated
+ * @since 2.9.0
+ */
+default void invalidateObject(final K key, final V obj, final DestroyMode 
mode) throws Exception {
+invalidateObject(key, obj);
+}
+
 /**
  * Return an instance to the pool. By contract, {@code obj}
  * must have been obtained using
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java 
b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
index 5bf8b11..0a24a47 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
@@ -114,6 +114,26 @@ public interface KeyedPooledObjectFactory {
 void destroyObject(K key, PooledObject p) throws Exception;
 
 /**
+ * Destroy an instance no longer needed by the pool, using the provided 
{@link DestroyMode}.
+ *
+ * @param key the 

[tomcat] branch master updated (b4775ee -> b346ab4)

[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 b4775ee  Update Commons FileUpload - cosmetic only
 new ac39b56  Align with Codec
 new b346ab4  Update Commons Pool 2 to 2.9.1-SNAPSHOT

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:
 MERGE.txt  |  2 +-
 .../apache/tomcat/dbcp/pool2/DestroyMode.java} | 16 +++---
 .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java  | 27 ++
 .../dbcp/pool2/KeyedPooledObjectFactory.java   | 20 +++
 java/org/apache/tomcat/dbcp/pool2/ObjectPool.java  | 24 +
 .../tomcat/dbcp/pool2/PooledObjectFactory.java | 23 +++-
 .../tomcat/dbcp/pool2/impl/EvictionTimer.java  |  2 +-
 .../dbcp/pool2/impl/GenericKeyedObjectPool.java| 52 +-
 .../tomcat/dbcp/pool2/impl/GenericObjectPool.java  | 63 ++
 .../apache/tomcat/util/codec/binary/Base64.java|  7 ++-
 webapps/docs/changelog.xml |  4 ++
 11 files changed, 190 insertions(+), 50 deletions(-)
 copy java/{jakarta/el/VariableMapper.java => 
org/apache/tomcat/dbcp/pool2/DestroyMode.java} (70%)


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

[tomcat] branch 7.0.x updated: Update Codec - no substantive changes

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new e9add4a  Update Codec - no substantive changes
e9add4a is described below

commit e9add4a6fff7cd6f9a3d7a8e1548e9bc09f0dd91
Author: Mark Thomas 
AuthorDate: Fri Jan 15 14:35:16 2021 +

Update Codec - no substantive changes
---
 .../util/http/fileupload/FileItemIterator.java | 14 ++--
 .../util/http/fileupload/FileItemStream.java   |  2 +-
 .../tomcat/util/http/fileupload/FileUpload.java|  6 +-
 .../util/http/fileupload/FileUploadBase.java   | 95 +++---
 .../util/http/fileupload/FileUploadException.java  |  6 +-
 .../http/fileupload/InvalidFileNameException.java  |  2 +-
 .../util/http/fileupload/MultipartStream.java  | 70 
 .../util/http/fileupload/ParameterParser.java  | 25 +++---
 .../util/http/fileupload/disk/DiskFileItem.java| 39 +
 .../http/fileupload/disk/DiskFileItemFactory.java  | 14 ++--
 .../http/fileupload/impl/FileItemIteratorImpl.java | 38 -
 .../http/fileupload/impl/FileItemStreamImpl.java   | 14 ++--
 .../impl/FileSizeLimitExceededException.java   |  8 +-
 .../fileupload/impl/FileUploadIOException.java |  2 +-
 .../fileupload/impl/IOFileUploadException.java |  2 +-
 .../impl/InvalidContentTypeException.java  |  5 +-
 .../util/http/fileupload/impl/SizeException.java   |  2 +-
 .../impl/SizeLimitExceededException.java   |  4 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  9 +-
 .../fileupload/servlet/ServletRequestContext.java  |  4 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  | 14 ++--
 .../http/fileupload/util/LimitedInputStream.java   |  8 +-
 .../tomcat/util/http/fileupload/util/Streams.java  | 20 ++---
 .../http/fileupload/util/mime/MimeUtility.java | 36 
 .../http/fileupload/util/mime/ParseException.java  |  2 +-
 .../util/mime/QuotedPrintableDecoder.java  | 16 ++--
 .../http/fileupload/util/mime/RFC2231Utility.java  | 28 +++
 27 files changed, 237 insertions(+), 248 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 59a81f4..53ec2d4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -34,7 +34,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setFileSizeMax(long)} on 
this object.
  * @return The maximum size of a single, uploaded file. The value -1 
indicates "unlimited".
  */
-public long getFileSizeMax();
+long getFileSizeMax();
 
 /** Sets the maximum size of a single file. An {@link 
FileSizeLimitExceededException}
  * will be thrown, if there is an uploaded file, which is exceeding this 
value.
@@ -45,7 +45,7 @@ public interface FileItemIterator {
  * Note:Changing this value doesn't affect files, that have 
already been uploaded.
  * @param pFileSizeMax The maximum size of a single, uploaded file. The 
value -1 indicates "unlimited".
  */
-public void setFileSizeMax(long pFileSizeMax);
+void setFileSizeMax(long pFileSizeMax);
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -54,7 +54,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setSizeMax(long)} on this 
object.
  * @return The maximum size of the complete HTTP request. The value -1 
indicates "unlimited".
  */
-public long getSizeMax();
+long getSizeMax();
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -66,7 +66,7 @@ public interface FileItemIterator {
  * yet been invoked.
  * @param pSizeMax The maximum size of the complete HTTP request. The 
value -1 indicates "unlimited".
  */
-public void setSizeMax(long pSizeMax);
+void setSizeMax(long pSizeMax);
 
 /**
  * Returns, whether another instance of {@link FileItemStream}
@@ -78,7 +78,7 @@ public interface FileItemIterator {
  * @return True, if one or more additional file items
  *   are available, otherwise false.
  */
-public boolean hasNext() throws FileUploadException, IOException;
+boolean hasNext() throws FileUploadException, IOException;
 
 /**
  * Returns the next available {@link FileItemStream}.
@@ -91,7 +91,7 @@ public interface FileItemIterator {
  * @return FileItemStream instance, which provides
  *   access to the next file item.
  */
-public FileItemStream next() throws 

[tomcat] branch 8.5.x updated: Update Commons FileUpload - cosmetic only

[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 0390727  Update Commons FileUpload - cosmetic only
0390727 is described below

commit 0390727f2224a412e983e4c768d092ddd6a5b769
Author: Mark Thomas 
AuthorDate: Fri Jan 15 14:35:16 2021 +

Update Commons FileUpload - cosmetic only
---
 MERGE.txt  |  2 +-
 .../util/http/fileupload/FileItemIterator.java | 14 ++--
 .../util/http/fileupload/FileItemStream.java   |  2 +-
 .../tomcat/util/http/fileupload/FileUpload.java|  6 +-
 .../util/http/fileupload/FileUploadBase.java   | 90 +++---
 .../util/http/fileupload/FileUploadException.java  |  6 +-
 .../http/fileupload/InvalidFileNameException.java  |  2 +-
 .../util/http/fileupload/MultipartStream.java  | 70 -
 .../util/http/fileupload/ParameterParser.java  | 25 +++---
 .../util/http/fileupload/disk/DiskFileItem.java| 38 -
 .../http/fileupload/disk/DiskFileItemFactory.java  | 14 ++--
 .../http/fileupload/impl/FileItemIteratorImpl.java | 38 -
 .../http/fileupload/impl/FileItemStreamImpl.java   | 14 ++--
 .../impl/FileSizeLimitExceededException.java   |  8 +-
 .../fileupload/impl/FileUploadIOException.java |  2 +-
 .../fileupload/impl/IOFileUploadException.java |  2 +-
 .../impl/InvalidContentTypeException.java  |  5 +-
 .../util/http/fileupload/impl/SizeException.java   |  2 +-
 .../impl/SizeLimitExceededException.java   |  4 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  9 +--
 .../fileupload/servlet/ServletRequestContext.java  |  4 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  | 14 ++--
 .../http/fileupload/util/LimitedInputStream.java   |  8 +-
 .../tomcat/util/http/fileupload/util/Streams.java  | 20 ++---
 .../http/fileupload/util/mime/MimeUtility.java | 36 -
 .../http/fileupload/util/mime/ParseException.java  |  2 +-
 .../util/mime/QuotedPrintableDecoder.java  | 16 ++--
 .../http/fileupload/util/mime/RFC2231Utility.java  | 28 +++
 28 files changed, 237 insertions(+), 244 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 1c449c7..8071016 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
+ee0a7131b6b87586b28542de354951414dedac3f (2021-01-15)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
   Commons IO.
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 59a81f4..53ec2d4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -34,7 +34,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setFileSizeMax(long)} on 
this object.
  * @return The maximum size of a single, uploaded file. The value -1 
indicates "unlimited".
  */
-public long getFileSizeMax();
+long getFileSizeMax();
 
 /** Sets the maximum size of a single file. An {@link 
FileSizeLimitExceededException}
  * will be thrown, if there is an uploaded file, which is exceeding this 
value.
@@ -45,7 +45,7 @@ public interface FileItemIterator {
  * Note:Changing this value doesn't affect files, that have 
already been uploaded.
  * @param pFileSizeMax The maximum size of a single, uploaded file. The 
value -1 indicates "unlimited".
  */
-public void setFileSizeMax(long pFileSizeMax);
+void setFileSizeMax(long pFileSizeMax);
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -54,7 +54,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setSizeMax(long)} on this 
object.
  * @return The maximum size of the complete HTTP request. The value -1 
indicates "unlimited".
  */
-public long getSizeMax();
+long getSizeMax();
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -66,7 +66,7 @@ public interface FileItemIterator {
  * yet been invoked.
  * @param pSizeMax The maximum size of the complete HTTP request. The 
value -1 indicates "unlimited".
  */
-public void setSizeMax(long pSizeMax);
+void setSizeMax(long pSizeMax);
 
 /**
  * Returns, whether another instance of {@link FileItemStream}
@@ -78,7 +78,7 @@ public interface 

[tomcat] branch 9.0.x updated: Update Commons FileUpload - cosmetic only

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ffa2c1c  Update Commons FileUpload - cosmetic only
ffa2c1c is described below

commit ffa2c1c832d5e368f1eb9ad40e9f1c61bb5fc571
Author: Mark Thomas 
AuthorDate: Fri Jan 15 14:35:16 2021 +

Update Commons FileUpload - cosmetic only
---
 MERGE.txt  |  2 +-
 .../util/http/fileupload/FileItemIterator.java | 14 ++--
 .../util/http/fileupload/FileItemStream.java   |  2 +-
 .../tomcat/util/http/fileupload/FileUpload.java|  6 +-
 .../util/http/fileupload/FileUploadBase.java   | 90 +++---
 .../util/http/fileupload/FileUploadException.java  |  6 +-
 .../http/fileupload/InvalidFileNameException.java  |  2 +-
 .../util/http/fileupload/MultipartStream.java  | 70 -
 .../util/http/fileupload/ParameterParser.java  | 25 +++---
 .../util/http/fileupload/disk/DiskFileItem.java| 38 -
 .../http/fileupload/disk/DiskFileItemFactory.java  | 14 ++--
 .../http/fileupload/impl/FileItemIteratorImpl.java | 38 -
 .../http/fileupload/impl/FileItemStreamImpl.java   | 14 ++--
 .../impl/FileSizeLimitExceededException.java   |  8 +-
 .../fileupload/impl/FileUploadIOException.java |  2 +-
 .../fileupload/impl/IOFileUploadException.java |  2 +-
 .../impl/InvalidContentTypeException.java  |  5 +-
 .../util/http/fileupload/impl/SizeException.java   |  2 +-
 .../impl/SizeLimitExceededException.java   |  4 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  9 +--
 .../fileupload/servlet/ServletRequestContext.java  |  4 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  | 14 ++--
 .../http/fileupload/util/LimitedInputStream.java   |  8 +-
 .../tomcat/util/http/fileupload/util/Streams.java  | 20 ++---
 .../http/fileupload/util/mime/MimeUtility.java | 36 -
 .../http/fileupload/util/mime/ParseException.java  |  2 +-
 .../util/mime/QuotedPrintableDecoder.java  | 16 ++--
 .../http/fileupload/util/mime/RFC2231Utility.java  | 28 +++
 28 files changed, 237 insertions(+), 244 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 1c449c7..8071016 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
+ee0a7131b6b87586b28542de354951414dedac3f (2021-01-15)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
   Commons IO.
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 59a81f4..53ec2d4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -34,7 +34,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setFileSizeMax(long)} on 
this object.
  * @return The maximum size of a single, uploaded file. The value -1 
indicates "unlimited".
  */
-public long getFileSizeMax();
+long getFileSizeMax();
 
 /** Sets the maximum size of a single file. An {@link 
FileSizeLimitExceededException}
  * will be thrown, if there is an uploaded file, which is exceeding this 
value.
@@ -45,7 +45,7 @@ public interface FileItemIterator {
  * Note:Changing this value doesn't affect files, that have 
already been uploaded.
  * @param pFileSizeMax The maximum size of a single, uploaded file. The 
value -1 indicates "unlimited".
  */
-public void setFileSizeMax(long pFileSizeMax);
+void setFileSizeMax(long pFileSizeMax);
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -54,7 +54,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setSizeMax(long)} on this 
object.
  * @return The maximum size of the complete HTTP request. The value -1 
indicates "unlimited".
  */
-public long getSizeMax();
+long getSizeMax();
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -66,7 +66,7 @@ public interface FileItemIterator {
  * yet been invoked.
  * @param pSizeMax The maximum size of the complete HTTP request. The 
value -1 indicates "unlimited".
  */
-public void setSizeMax(long pSizeMax);
+void setSizeMax(long pSizeMax);
 
 /**
  * Returns, whether another instance of {@link FileItemStream}
@@ -78,7 +78,7 @@ public interface 

[tomcat] branch master updated: Update Commons FileUpload - cosmetic only

[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 b4775ee  Update Commons FileUpload - cosmetic only
b4775ee is described below

commit b4775eec749ea15117719900346cf2563137db9e
Author: Mark Thomas 
AuthorDate: Fri Jan 15 14:35:16 2021 +

Update Commons FileUpload - cosmetic only
---
 MERGE.txt  |  2 +-
 .../util/http/fileupload/FileItemIterator.java | 14 ++--
 .../util/http/fileupload/FileItemStream.java   |  2 +-
 .../tomcat/util/http/fileupload/FileUpload.java|  6 +-
 .../util/http/fileupload/FileUploadBase.java   | 90 +++---
 .../util/http/fileupload/FileUploadException.java  |  6 +-
 .../http/fileupload/InvalidFileNameException.java  |  2 +-
 .../util/http/fileupload/MultipartStream.java  | 70 -
 .../util/http/fileupload/ParameterParser.java  | 25 +++---
 .../util/http/fileupload/disk/DiskFileItem.java| 38 -
 .../http/fileupload/disk/DiskFileItemFactory.java  | 14 ++--
 .../http/fileupload/impl/FileItemIteratorImpl.java | 38 -
 .../http/fileupload/impl/FileItemStreamImpl.java   | 14 ++--
 .../impl/FileSizeLimitExceededException.java   |  8 +-
 .../fileupload/impl/FileUploadIOException.java |  2 +-
 .../fileupload/impl/IOFileUploadException.java |  2 +-
 .../impl/InvalidContentTypeException.java  |  5 +-
 .../util/http/fileupload/impl/SizeException.java   |  2 +-
 .../impl/SizeLimitExceededException.java   |  4 +-
 .../http/fileupload/servlet/ServletFileUpload.java |  9 +--
 .../fileupload/servlet/ServletRequestContext.java  |  4 +-
 .../http/fileupload/util/FileItemHeadersImpl.java  | 14 ++--
 .../http/fileupload/util/LimitedInputStream.java   |  8 +-
 .../tomcat/util/http/fileupload/util/Streams.java  | 20 ++---
 .../http/fileupload/util/mime/MimeUtility.java | 36 -
 .../http/fileupload/util/mime/ParseException.java  |  2 +-
 .../util/mime/QuotedPrintableDecoder.java  | 16 ++--
 .../http/fileupload/util/mime/RFC2231Utility.java  | 28 +++
 28 files changed, 237 insertions(+), 244 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 1c449c7..8071016 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -51,7 +51,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-c25a4e33553a5f098ab6065a54e1ae7985025d26 (2020-08-26)
+ee0a7131b6b87586b28542de354951414dedac3f (2021-01-15)
 
 Note: Tomcat's copy of fileupload also includes classes copied manually from
   Commons IO.
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java 
b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
index 59a81f4..53ec2d4 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemIterator.java
@@ -34,7 +34,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setFileSizeMax(long)} on 
this object.
  * @return The maximum size of a single, uploaded file. The value -1 
indicates "unlimited".
  */
-public long getFileSizeMax();
+long getFileSizeMax();
 
 /** Sets the maximum size of a single file. An {@link 
FileSizeLimitExceededException}
  * will be thrown, if there is an uploaded file, which is exceeding this 
value.
@@ -45,7 +45,7 @@ public interface FileItemIterator {
  * Note:Changing this value doesn't affect files, that have 
already been uploaded.
  * @param pFileSizeMax The maximum size of a single, uploaded file. The 
value -1 indicates "unlimited".
  */
-public void setFileSizeMax(long pFileSizeMax);
+void setFileSizeMax(long pFileSizeMax);
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -54,7 +54,7 @@ public interface FileItemIterator {
  * request specific value by invoking {@link #setSizeMax(long)} on this 
object.
  * @return The maximum size of the complete HTTP request. The value -1 
indicates "unlimited".
  */
-public long getSizeMax();
+long getSizeMax();
 
 /** Returns the maximum size of the complete HTTP request. A {@link 
SizeLimitExceededException}
  * will be thrown, if the HTTP request will exceed this value.
@@ -66,7 +66,7 @@ public interface FileItemIterator {
  * yet been invoked.
  * @param pSizeMax The maximum size of the complete HTTP request. The 
value -1 indicates "unlimited".
  */
-public void setSizeMax(long pSizeMax);
+void setSizeMax(long pSizeMax);
 
 /**
  * Returns, whether another instance of {@link FileItemStream}
@@ -78,7 +78,7 @@ public interface 

[tomcat] branch 7.0.x updated: Update codec - no substantive change

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new d93e41f  Update codec - no substantive change
d93e41f is described below

commit d93e41f4eb8876069bf7126fbdf1232a33969e29
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:27:10 2021 +

Update codec - no substantive change
---
 java/org/apache/tomcat/util/codec/binary/Base64.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 581d7ea..3c76ca2 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -375,8 +375,8 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte b : arrayOctet) {
-if (!isBase64(b) && !isWhiteSpace(b)) {
+for (byte element : arrayOctet) {
+if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }
 }
@@ -443,7 +443,8 @@ public class Base64 extends BaseNCodec {
 private static void validateCharacter(final int emptyBitsMask, final 
Context context) {
 if ((context.ibitWorkArea & emptyBitsMask) != 0) {
 throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a 
valid base 64 alphabet but not a possible value. " +
+"Last encoded character (before the paddings if any) is a 
valid " +
+"base 64 alphabet but not a possible value. " +
 "Expected the discarded bits to be zero.");
 }
 }
@@ -601,8 +602,7 @@ public class Base64 extends BaseNCodec {
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
-this.lineSeparator = new byte[lineSeparator.length];
-System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, 
lineSeparator.length);
+this.lineSeparator = lineSeparator.clone();
 } else {
 this.encodeSize = BYTES_PER_ENCODED_BLOCK;
 this.lineSeparator = null;


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

[tomcat] branch 8.5.x updated: Update Codec - no substantive changes

[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 67e83a7  Update Codec - no substantive changes
67e83a7 is described below

commit 67e83a7d690b78f6f0cb9fd5cacd579cbe503d89
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:27:10 2021 +

Update Codec - no substantive changes
---
 MERGE.txt |  2 +-
 java/org/apache/tomcat/util/codec/binary/Base64.java  | 10 +-
 java/org/apache/tomcat/util/codec/binary/StringUtils.java |  8 
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 58541c1..1c449c7 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
+2e9785b93a2aacedd84abc6a646cdb200940b818 (2021-01-15)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 2b5c7d4..08d7d34 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -360,8 +360,8 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte b : arrayOctet) {
-if (!isBase64(b) && !isWhiteSpace(b)) {
+for (byte element : arrayOctet) {
+if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }
 }
@@ -428,7 +428,8 @@ public class Base64 extends BaseNCodec {
 private static void validateCharacter(final int emptyBitsMask, final 
Context context) {
 if ((context.ibitWorkArea & emptyBitsMask) != 0) {
 throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a 
valid base 64 alphabet but not a possible value. " +
+"Last encoded character (before the paddings if any) is a 
valid " +
+"base 64 alphabet but not a possible value. " +
 "Expected the discarded bits to be zero.");
 }
 }
@@ -586,8 +587,7 @@ public class Base64 extends BaseNCodec {
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
-this.lineSeparator = new byte[lineSeparator.length];
-System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, 
lineSeparator.length);
+this.lineSeparator = lineSeparator.clone();
 } else {
 this.encodeSize = BYTES_PER_ENCODED_BLOCK;
 this.lineSeparator = null;
diff --git a/java/org/apache/tomcat/util/codec/binary/StringUtils.java 
b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
index 673dd0f..979313b 100644
--- a/java/org/apache/tomcat/util/codec/binary/StringUtils.java
+++ b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
@@ -55,8 +55,8 @@ public class StringUtils {
  *the String to encode, may be {@code null}
  * @return encoded bytes, or {@code null} if the input string was {@code 
null}
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  * @see http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
@@ -88,8 +88,8 @@ public class StringUtils {
  * @return A new {@code String} decoded from the specified array of bytes 
using the US-ASCII charset,
  * or {@code null} if the input byte array was {@code null}.
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  */
 public static String 

[tomcat] branch 9.0.x updated: Update Codec - no substantive changes

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ee582a4  Update Codec - no substantive changes
ee582a4 is described below

commit ee582a4ef0baa29d88e154b5d3d8efaa1ca418f6
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:27:10 2021 +

Update Codec - no substantive changes
---
 MERGE.txt |  2 +-
 java/org/apache/tomcat/util/codec/binary/Base64.java  | 10 +-
 java/org/apache/tomcat/util/codec/binary/StringUtils.java |  8 
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 58541c1..1c449c7 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
+2e9785b93a2aacedd84abc6a646cdb200940b818 (2021-01-15)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 2b5c7d4..08d7d34 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -360,8 +360,8 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte b : arrayOctet) {
-if (!isBase64(b) && !isWhiteSpace(b)) {
+for (byte element : arrayOctet) {
+if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }
 }
@@ -428,7 +428,8 @@ public class Base64 extends BaseNCodec {
 private static void validateCharacter(final int emptyBitsMask, final 
Context context) {
 if ((context.ibitWorkArea & emptyBitsMask) != 0) {
 throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a 
valid base 64 alphabet but not a possible value. " +
+"Last encoded character (before the paddings if any) is a 
valid " +
+"base 64 alphabet but not a possible value. " +
 "Expected the discarded bits to be zero.");
 }
 }
@@ -586,8 +587,7 @@ public class Base64 extends BaseNCodec {
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
-this.lineSeparator = new byte[lineSeparator.length];
-System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, 
lineSeparator.length);
+this.lineSeparator = lineSeparator.clone();
 } else {
 this.encodeSize = BYTES_PER_ENCODED_BLOCK;
 this.lineSeparator = null;
diff --git a/java/org/apache/tomcat/util/codec/binary/StringUtils.java 
b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
index 673dd0f..979313b 100644
--- a/java/org/apache/tomcat/util/codec/binary/StringUtils.java
+++ b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
@@ -55,8 +55,8 @@ public class StringUtils {
  *the String to encode, may be {@code null}
  * @return encoded bytes, or {@code null} if the input string was {@code 
null}
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  * @see http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
@@ -88,8 +88,8 @@ public class StringUtils {
  * @return A new {@code String} decoded from the specified array of bytes 
using the US-ASCII charset,
  * or {@code null} if the input byte array was {@code null}.
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  */
 public static String 

[tomcat] branch master updated: Update Codec - no substantive changes

[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 c9214a0  Update Codec - no substantive changes
c9214a0 is described below

commit c9214a0f18758de37a1fb432cfd25532953ea635
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:27:10 2021 +

Update Codec - no substantive changes
---
 MERGE.txt |  2 +-
 java/org/apache/tomcat/util/codec/binary/Base64.java  | 10 +-
 java/org/apache/tomcat/util/codec/binary/StringUtils.java |  8 
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index 58541c1..1c449c7 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -43,7 +43,7 @@ Codec
 Sub-tree:
 src/main/java/org/apache/commons/codec
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-53c93d0ffccb65d182306c74d1230ce814889dc1 (2020-08-18)
+2e9785b93a2aacedd84abc6a646cdb200940b818 (2021-01-15)
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
 FileUpload
diff --git a/java/org/apache/tomcat/util/codec/binary/Base64.java 
b/java/org/apache/tomcat/util/codec/binary/Base64.java
index 2b5c7d4..08d7d34 100644
--- a/java/org/apache/tomcat/util/codec/binary/Base64.java
+++ b/java/org/apache/tomcat/util/codec/binary/Base64.java
@@ -360,8 +360,8 @@ public class Base64 extends BaseNCodec {
  * @since 1.5
  */
 public static boolean isBase64(final byte[] arrayOctet) {
-for (byte b : arrayOctet) {
-if (!isBase64(b) && !isWhiteSpace(b)) {
+for (byte element : arrayOctet) {
+if (!isBase64(element) && !isWhiteSpace(element)) {
 return false;
 }
 }
@@ -428,7 +428,8 @@ public class Base64 extends BaseNCodec {
 private static void validateCharacter(final int emptyBitsMask, final 
Context context) {
 if ((context.ibitWorkArea & emptyBitsMask) != 0) {
 throw new IllegalArgumentException(
-"Last encoded character (before the paddings if any) is a 
valid base 64 alphabet but not a possible value. " +
+"Last encoded character (before the paddings if any) is a 
valid " +
+"base 64 alphabet but not a possible value. " +
 "Expected the discarded bits to be zero.");
 }
 }
@@ -586,8 +587,7 @@ public class Base64 extends BaseNCodec {
 }
 if (lineLength > 0){ // null line-sep forces no chunking rather 
than throwing IAE
 this.encodeSize = BYTES_PER_ENCODED_BLOCK + 
lineSeparator.length;
-this.lineSeparator = new byte[lineSeparator.length];
-System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, 
lineSeparator.length);
+this.lineSeparator = lineSeparator.clone();
 } else {
 this.encodeSize = BYTES_PER_ENCODED_BLOCK;
 this.lineSeparator = null;
diff --git a/java/org/apache/tomcat/util/codec/binary/StringUtils.java 
b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
index 673dd0f..979313b 100644
--- a/java/org/apache/tomcat/util/codec/binary/StringUtils.java
+++ b/java/org/apache/tomcat/util/codec/binary/StringUtils.java
@@ -55,8 +55,8 @@ public class StringUtils {
  *the String to encode, may be {@code null}
  * @return encoded bytes, or {@code null} if the input string was {@code 
null}
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#UTF_8} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  * @see http://download.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html;>Standard
 charsets
  */
@@ -88,8 +88,8 @@ public class StringUtils {
  * @return A new {@code String} decoded from the specified array of bytes 
using the US-ASCII charset,
  * or {@code null} if the input byte array was {@code null}.
  * @throws NullPointerException
- * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen since it is
- * required by the Java platform specification.
+ * Thrown if {@link StandardCharsets#US_ASCII} is not 
initialized, which should never happen
+ * since it is required by the Java platform specification.
  * @since As of 1.7, throws {@link NullPointerException} instead of 
UnsupportedEncodingException
  */
 public static 

[Bug 64850] Add support to tomcat for JEP380: Unix domain sockets

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64850

--- Comment #7 from Graham Leggett  ---
Thank you to @rmaucher - support for UDS now available for NIO:

https://github.com/apache/tomcat/commit/0d276556881446aa499fefd496d567606bc0ddec

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: Update BCEL

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 5603c74  Update BCEL
5603c74 is described below

commit 5603c7484d417d903e6490232aa9071db5248852
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:00:15 2021 +

Update BCEL

Only change is removal of one superfluous call to super(). Not worth an
entry in the change log.
---
 java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 86a9e0b..f841735 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -27,7 +27,6 @@ public class ClassFormatException extends RuntimeException {
 private static final long serialVersionUID = 3243149520175287759L;
 
 public ClassFormatException() {
-super();
 }
 
 


-
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: Update BCEL

[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 94cca48  Update BCEL
94cca48 is described below

commit 94cca4885a9c5edaaa27cbb53bd8371c4a189396
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:00:15 2021 +

Update BCEL

Only change is removal of one superfluous call to super(). Not worth an
entry in the chaneg log.
---
 MERGE.txt| 2 +-
 java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index b8c152d..58541c1 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.5.0
+4637826ac76db6cd4ff7eb56d1b13e16d4b43320 (2021-01-15)
 
 Codec
 -
diff --git 
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 86a9e0b..f841735 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -27,7 +27,6 @@ public class ClassFormatException extends RuntimeException {
 private static final long serialVersionUID = 3243149520175287759L;
 
 public ClassFormatException() {
-super();
 }
 
 


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

[tomcat] branch 9.0.x updated: Update BCEL

[markt]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c96b721  Update BCEL
c96b721 is described below

commit c96b721851a0da4d38880cfa6343a276aedb7a01
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:00:15 2021 +

Update BCEL

Only change is removal of one superfluous call to super(). Not worth an
entry in the chaneg log.
---
 MERGE.txt| 2 +-
 java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index b8c152d..58541c1 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.5.0
+4637826ac76db6cd4ff7eb56d1b13e16d4b43320 (2021-01-15)
 
 Codec
 -
diff --git 
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 86a9e0b..f841735 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -27,7 +27,6 @@ public class ClassFormatException extends RuntimeException {
 private static final long serialVersionUID = 3243149520175287759L;
 
 public ClassFormatException() {
-super();
 }
 
 


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

[tomcat] branch master updated: Update BCEL

[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 8c69446  Update BCEL
8c69446 is described below

commit 8c69446a7b5c0c315c9a6c9ef50f84af28b5d400
Author: Mark Thomas 
AuthorDate: Fri Jan 15 12:00:15 2021 +

Update BCEL

Only change is removal of one superfluous call to super(). Not worth an
entry in the chaneg log.
---
 MERGE.txt| 2 +-
 java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index b8c152d..58541c1 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -36,7 +36,7 @@ BCEL
 Sub-tree:
 src/main/java/org/apache/bcel
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.5.0
+4637826ac76db6cd4ff7eb56d1b13e16d4b43320 (2021-01-15)
 
 Codec
 -
diff --git 
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 86a9e0b..f841735 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -27,7 +27,6 @@ public class ClassFormatException extends RuntimeException {
 private static final long serialVersionUID = 3243149520175287759L;
 
 public ClassFormatException() {
-super();
 }
 
 


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

JDK 16 is now in Rampdown Phase Two

[Rory O'Donnell]

Hi Mark,

*Per the JDK 16 schedule , we are in Rampdown Phase Two* *[1] .
*

*Please advise if you find any issues while testing the latest Early 
Access builds.*


 * Schedule for JDK 16
 o *2021/01/14  Rampdown Phase Two*
 o 2021/02/04  Initial Release Candidate
 o 2021/02/18  Final Release Candidate
 o 2021/03/16  General Availability
 * Release Notes [2]

OpenJDK 16 Early Access build 32**is now available at 
http://jdk.java.net/16


 * These early-access, open-source builds are provided under the GNU
   General Public License, version 2, with the Classpath Exception
   .
 * Features [3] - the overall feature set is frozen. No further JEPs
   will be targeted to this release.
 * Changes in recent builds that maybe of interest:
 o Build 32:
 + JDK-8259028 - ClassCastException when using custom
   filesystem with wrapper FileChannel impl
 # Apache Lucene found.
 + JDK-8253996 - Javac error on jdk16 build 18: invalid flag:
   -Xdoclint:-missing
 # Apache Zookeeper found.
 o Build 31:
 + JDK-8259027: NullPointerException in makeMappedSegment due
   to NULL Unmapper when length of segment is 0
 # Reported by Apache Lucene
 o Build 30:
 + JDK-8254023: A module declaration is not allowed to be a
   target of an annotation that lacks an @Target meta-annotation
 # Reported by JUnit5
 + JDK-8256693: getAnnotatedReceiverType parameterizes types
   too eagerly

 * JDK 16 - topics of interest
 o Investigating MD5 overheads:
   https://cl4es.github.io/2021/01/04/Investigating-MD5-Overheads.html
 o Towards OpenJDK 17 - a quick update on startup performance
   https://cl4es.github.io/2020/12/06/Towards-OpenJDK-17.html
 o Migrating OpenJDK to Git & GitHub - GitHub Universe 2020 session
   replay
   https://inside.java/2020/12/11/skara-github-universe/

Project Panama/foreign EA Build 16-panama+3-385 (2020/12/10) 
 is available now [4]


 * What's new
 o jextract is now fully compatible with Java 16
 o New architecture based on Foreign-Memory Access API (JEP 370
   , JEP 383
   , JEP 393
   ) and Foreign Linker API (JEP
   389 )

 * These early-access builds are provided under the GNU General Public
   License, version 2, with the Classpath Exception
   
 * EA builds are produced for the purpose of gathering feedback. Use
   for any other purpose is at your own risk.
 * Please send feedback via e-mail to panama-...@openjdk.java.net
   . To send e-mail to this address you
   must first subscribe to the mailing list
   .

 * Project Panama - topics of interest
 o “The Vector API” with John Rose and Paul Sandoz
   https://inside.java/2020/11/17/podcast-007/
 o “The Foreign Memory Access API” with Maurizio Cimadamore and
   Jorn Vernee
   https://inside.java/2020/12/11/podcast-009/
 o “The Foreign Linker API” with Maurizio Cimadamore and Jorn Vernee
   https://inside.java/2020/12/21/podcast-010/

OpenJDK 17 Early Access build 5**is now available at http://jdk.java.net/17

 * These early-access, open-source builds are provided under the GNU
   General Public License, version 2, with the Classpath Exception
   .
 * Changes in recent builds that maybe of interest:
 o Build 4:
 + JDK-8258800: Deprecate -XX:+AlwaysLockClassLoader
 o Build 3:
 + JDK-8246005: KeyStoreSpi::engineStore(LoadStoreParameter)
   spec mismatch to its behavior
 + JDK-8258765: getAnnotatedReceiverType parameterizes types
   too eagerly
 * JDK 17 - topic of interest
 o Towards OpenJDK 17 - a quick update on startup performance:
 + https://cl4es.github.io/2020/12/06/Towards-OpenJDK-17.html

Java Cryptographic Roadmap [5] has been updated

 * Removing root certificates with 1024-bit keys in July 2021 CPU.
 * Disabling of SHA-1 JARS signed after 2019-01-01 has been postponed
   to July 2021 CPU.

Rgds, Rory

[1] https://mail.openjdk.java.net/pipermail/jdk-dev/2021-January/005001.html
[2] https://jdk.java.net/16/release-notes
[3] http://openjdk.java.net/projects/jdk/16/ 

[4] 
https://mail.openjdk.java.net/pipermail/panama-dev/2020-December/011605.html 

[5] https://java.com/en/jre-jdk-cryptoroadmap.html