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

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


 discard a17d338  Add proper tests in TestStandardWrapper
    omit 64f5402  Move Context#findRoleMapping() to 
Wrapper#findSecurityReference()
    omit 7b9ff2c  Change position in changelog.xml
    omit 738380b  BZ 63636: Context#findRoleMapping() never called in 
RealmBase#hasRole()
     add d3a5b1c  Refactor Servlet 3 async timeouts to become a more generic 
timeout
     add 863b18e  Extend the timeout functionality to internal upgrade 
processors
     add 5d7f2ea  Improve HTTP/2 connection timeout handling
     add e3a59c3  Update expiring test certs
     add 62da9b7  Align the comments with the usage message
     add 7ac5fc8  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63285
     add 4aac8d4  Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63650
     add 6d6e1c4  Fix https://github.com/apache/tomcat/pull/187 Avoid NPE
     add 9feda96  Merge additional fix for DBCP-555
     add 2933e68  Refactor fix for BZ 63285 so .exe rename is on request not by 
default
     new c9d3859  BZ 63636: Context#findRoleMapping() never called in 
RealmBase#hasRole()
     new 6406825  Change position in changelog.xml
     new d53f76b  Move Context#findRoleMapping() to 
Wrapper#findSecurityReference()
     new 01e3233  Add proper tests in TestStandardWrapper

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a17d338)
            \
             N -- N -- N   refs/heads/BZ-63636/tomcat-9.0.x (01e3233)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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


Summary of changes:
 MERGE.txt                                          |   2 +-
 bin/service.bat                                    | 122 ++++++++++------
 .../valves/CrawlerSessionManagerValve.java         |   2 +-
 java/org/apache/coyote/AbstractProcessor.java      |   9 +-
 java/org/apache/coyote/AbstractProtocol.java       |  34 +++--
 java/org/apache/coyote/Processor.java              |  14 +-
 .../http11/upgrade/InternalHttpUpgradeHandler.java |   2 +
 .../http11/upgrade/UpgradeProcessorBase.java       |  10 +-
 .../http11/upgrade/UpgradeProcessorInternal.java   |   6 +
 .../coyote/http2/Http2AsyncUpgradeHandler.java     |   6 +-
 .../apache/coyote/http2/Http2UpgradeHandler.java   |  97 ++++++++++---
 .../tomcat/dbcp/dbcp2/DelegatingConnection.java    |  10 +-
 .../tomcat/dbcp/dbcp2/DelegatingStatement.java     |  10 +-
 .../dbcp/dbcp2/PoolableCallableStatement.java      |   8 +-
 .../dbcp/dbcp2/PoolablePreparedStatement.java      |   8 +-
 .../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java |   8 +-
 java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 121 ++++++++--------
 .../websocket/server/WsHttpUpgradeHandler.java     |   6 +
 .../valves/TestCrawlerSessionManagerValve.java     |  41 +++++-
 .../http11/upgrade/TestUpgradeInternalHandler.java |   5 +
 .../apache/tomcat/util/net/localhost-rsa-cert.pem  | 154 +++++++++++----------
 .../apache/tomcat/util/net/localhost-rsa-copy1.jks | Bin 4404 -> 2737 bytes
 .../apache/tomcat/util/net/localhost-rsa-key.pem   |  52 +++----
 test/org/apache/tomcat/util/net/localhost-rsa.jks  | Bin 4404 -> 4455 bytes
 test/org/apache/tomcat/util/net/user1.jks          | Bin 2666 -> 2717 bytes
 webapps/docs/changelog.xml                         |  31 ++++-
 webapps/docs/windows-service-howto.xml             |  14 +-
 27 files changed, 498 insertions(+), 274 deletions(-)


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

Reply via email to