This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 656426159477b4c1e6c64c80b16c7bea16bde3d6
Merge: 3726e4a 4c11155
Author: Jonathan Valliere <jon.valli...@emoten.com>
AuthorDate: Thu Aug 19 13:59:30 2021 -0400
Merge branch 'bugfix/DIRMINA1132' into 2.2.X
.../apache/mina/core/buffer/AbstractIoBuffer.java | 2 +
.../core/filterchain/DefaultIoFilterChain.java | 34 +-
.../mina/core/session/AbstractIoSession.java | 5 +
.../org/apache/mina/core/session/IoSession.java | 5 +
.../mina/core/write/WriteRejectedException.java | 44 ++
.../mina/filter/ssl/BogusTrustManagerFactory.java | 112 +--
.../apache/mina/filter/ssl/KeyStoreFactory.java | 292 ++++----
.../apache/mina/filter/ssl/SslContextFactory.java | 782 +++++++++++----------
.../java/org/apache/mina/filter/ssl/SslEvent.java | 6 +-
.../org/apache/mina/filter/ssl/SslHandler.java | 3 +-
.../org/apache/mina/filter/ssl/package-info.java | 3 +-
.../mina/filter/ssl2/EncryptedWriteRequest.java | 19 +
.../org/apache/mina/filter/ssl2/SSL2Filter.java | 319 +++++++++
.../org/apache/mina/filter/ssl2/SSL2Handler.java | 259 +++++++
.../org/apache/mina/filter/ssl2/SSL2HandlerG0.java | 574 +++++++++++++++
.../transport/socket/nio/NioSocketSession.java | 612 ++++++++--------
.../org/apache/mina/util/BasicThreadFactory.java | 62 ++
.../java/org/apache/mina/util/StackInspector.java | 78 ++
.../apache/mina/filter/ssl2/SSL2SimpleTest.java | 127 ++++
.../org/apache/mina/filter/ssl2/keystore.jks | Bin 0 -> 1368 bytes
.../org/apache/mina/filter/ssl2/truststore.jks | Bin 0 -> 654 bytes
21 files changed, 2416 insertions(+), 922 deletions(-)
