You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2018/04/02 08:23:01 UTC
[3/6] mina git commit: Added a flag to be used when one does not want
the handshake to start immediately after the SslFilter has been added into
the chain
Added a flag to be used when one does not want the handshake to start
immediately after the SslFilter has been added into the chain
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/7c4dc7b9
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/7c4dc7b9
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/7c4dc7b9
Branch: refs/heads/2.0
Commit: 7c4dc7b9868b4b51dfa4d84e0c2ac80813831f7a
Parents: 1ee000d
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Mar 31 09:42:18 2018 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Mar 31 09:42:18 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/mina/filter/ssl/SslFilter.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/7c4dc7b9/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index 3494d50..846f1d8 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -159,7 +159,10 @@ public class SslFilter extends IoFilterAdapter {
private final boolean autoStart;
/** A flag used to determinate if the handshake should start immediately */
- private static final boolean START_HANDSHAKE = true;
+ public static final boolean START_HANDSHAKE = true;
+
+ /** A flag used to determinate if the handshake should wait for the client to initiate the handshake */
+ public static final boolean CLIENT_HANDSHAKE = false;
private boolean client;
@@ -173,7 +176,8 @@ public class SslFilter extends IoFilterAdapter {
/**
* Creates a new SSL filter using the specified {@link SSLContext}.
- * The handshake will start immediately.
+ * The handshake will start immediately after the filter has been added
+ * to the chain.
*
* @param sslContext The SSLContext to use
*/
@@ -184,7 +188,8 @@ public class SslFilter extends IoFilterAdapter {
/**
* Creates a new SSL filter using the specified {@link SSLContext}.
* If the <tt>autostart</tt> flag is set to <tt>true</tt>, the
- * handshake will start immediately.
+ * handshake will start immediately after the filter has been added
+ * to the chain.
*
* @param sslContext The SSLContext to use
* @param autoStart The flag used to tell the filter to start the handshake immediately